active_model_serializers_binary 0.0.25 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7e6176e80446184f50b715b1db5308f5d0555ff
-  data.tar.gz: 2449dbbc3c428edf4c903968da0d048e89dad5a6
+  metadata.gz: 8867fc2c627dc2fe2e4e7c064bd1ed5ae721eb89
+  data.tar.gz: b096205753623930ad89c0c9dd4d308f3ff8ef19
 SHA512:
-  metadata.gz: 89f0fd0d0312d221276908a5bff529f5815462782360f1b919caabe171a65e10ef435e4288e19e90962ce86f66e899c7b2914a37be9a74cfacf8e9f548fb65b1
-  data.tar.gz: 1aa798e4988b906b44c8d13b0877f0d9ca9d9945878af76341adbd9f97021ad93b0814902f885b594fd8ab9c68fe946878f8360491a9223d2a41bfdb4095fc90
+  metadata.gz: c89aed42e8c94feb10867ee254dec8638e9ecae1ed8b414cef0792ec08e50e000d08dc99c0ea1e0356bbf1efc19b2a086b213efb63d4b69b69b07f8a9b148804
+  data.tar.gz: 7acb69425c7502733109d4200fb255951a93f5354d8cb2d3b6c1662948f521264d470099cab822e472593250aac36eeb4868a34e86a80077988c4c0b30258898

data/Gemfile.lock

@@ -1,86 +1,80 @@
 PATH
   remote: .
   specs:
-    active_model_serializers_binary (0.0.24)
-      activemodel (~> 4.1)
+    active_model_serializers_binary (0.1.5)
+      activemodel (~> 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.4)
-      actionpack (= 4.1.4)
-      actionview (= 4.1.4)
-      mail (~> 2.5.4)
-    actionpack (4.1.4)
-      actionview (= 4.1.4)
-      activesupport (= 4.1.4)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.4)
-      activesupport (= 4.1.4)
+    actioncable (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      nio4r (~> 1.2)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.0.1)
+      actionview (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.0.0.1)
+      activesupport (= 5.0.0.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.4)
-      activesupport (= 4.1.4)
-      builder (~> 3.1)
-    activerecord (4.1.4)
-      activemodel (= 4.1.4)
-      activesupport (= 4.1.4)
-      arel (~> 5.0.0)
-    activesupport (4.1.4)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (5.0.0.1)
+      activesupport (= 5.0.0.1)
+      globalid (>= 0.3.6)
+    activemodel (5.0.0.1)
+      activesupport (= 5.0.0.1)
+    activerecord (5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      arel (~> 7.0)
+    activesupport (5.0.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    annotate (2.6.5)
-      activerecord (>= 2.3.0)
-      rake (>= 0.8.7)
-    arel (5.0.1.20140414130214)
-    bcrypt (3.1.7)
+    annotate (2.7.1)
+      activerecord (>= 3.2, < 6.0)
+      rake (>= 10.4, < 12.0)
+    arel (7.1.1)
     builder (3.2.2)
     byebug (4.0.5)
       columnize (= 0.9.0)
     coderay (1.1.0)
-    coffee-rails (4.0.1)
-      coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
-    coffee-script (2.3.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.7.1)
     colorize (0.7.3)
     columnize (0.9.0)
-    devise (3.2.4)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
-      thread_safe (~> 0.1)
-      warden (~> 1.2.3)
+    concurrent-ruby (1.0.2)
     erubis (2.7.0)
-    execjs (2.2.1)
-    hike (1.2.3)
-    i18n (0.6.11)
+    globalid (0.3.7)
+      activesupport (>= 4.1.0)
+    i18n (0.7.0)
     interception (0.5)
-    jbuilder (1.5.3)
-      activesupport (>= 3.0.0)
-      multi_json (>= 1.2.0)
-    jquery-ui-rails (4.2.1)
-      railties (>= 3.2.16)
-    jquery-validation-rails (1.12.0)
-      railties (>= 3.2, < 5.0)
-      thor (~> 0.14)
-    json (1.8.3)
-    libv8 (3.16.14.3)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     method_source (0.8.2)
-    mime-types (1.25.1)
-    minitest (5.4.0)
-    multi_json (1.10.1)
-    orm_adapter (0.5.0)
-    polyglot (0.3.5)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    nio4r (1.2.1)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -96,61 +90,49 @@ GEM
     pry-rescue (1.4.2)
       interception (>= 0.5)
       pry
-    rack (1.5.2)
-    rack-test (0.6.2)
+    rack (2.0.1)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.4)
-      actionmailer (= 4.1.4)
-      actionpack (= 4.1.4)
-      actionview (= 4.1.4)
-      activemodel (= 4.1.4)
-      activerecord (= 4.1.4)
-      activesupport (= 4.1.4)
+    rails (5.0.0.1)
+      actioncable (= 5.0.0.1)
+      actionmailer (= 5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activerecord (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.4)
-      sprockets-rails (~> 2.0)
-    railties (4.1.4)
-      actionpack (= 4.1.4)
-      activesupport (= 4.1.4)
+      railties (= 5.0.0.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.1)
+      activesupport (>= 4.2.0, < 6.0)
+      nokogiri (~> 1.6.0)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
-    ref (1.0.5)
-    sass (3.2.19)
-    sass-rails (4.0.3)
-      railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.0)
-      sprockets (~> 2.8, <= 2.11.0)
-      sprockets-rails (~> 2.0)
+    rake (10.5.0)
     slop (3.6.0)
-    sprockets (2.11.0)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    sqlite3 (1.3.9)
-    therubyracer (0.12.1)
-      libv8 (~> 3.16.14.0)
-      ref
+    sprockets (3.7.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.11)
     thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    turbolinks (2.2.2)
-      coffee-rails
-    tzinfo (1.2.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (1.3.0)
-      execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
-    warden (1.2.3)
-      rack (>= 1.0)
+    websocket-driver (0.6.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
     yard (0.8.7.6)
 
 PLATFORMS
@@ -160,24 +142,15 @@ DEPENDENCIES
   active_model_serializers_binary!
   annotate
   bundler (~> 1.6)
-  coffee-rails (~> 4.0)
   colorize (~> 0.7)
-  devise (~> 3.2)
-  jbuilder (~> 1.2)
-  jquery-ui-rails (~> 4.2)
-  jquery-validation-rails (~> 1.12)
   pry
   pry-byebug
   pry-doc
   pry-rails
   pry-rescue
-  rails (~> 4.1)
+  rails (~> 5.0)
   rake (~> 10.3)
-  sass-rails (~> 4.0)
-  sqlite3 (~> 1.3)
-  therubyracer (~> 0.12)
-  turbolinks (~> 2.2)
-  uglifier (~> 1.3)
+  sqlite3
 
 BUNDLED WITH
-   1.11.2
+   1.15.3

data/active_model_serializers_binary.gemspec

@@ -21,19 +21,19 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "bundler", "~> 1.6"
   s.add_development_dependency "rake", "~> 10.3"
-  s.add_development_dependency "sqlite3", "~> 1.3"
-  s.add_development_dependency "rails", "~> 4.1"
+  s.add_development_dependency "sqlite3"
+  s.add_development_dependency "rails", "~> 5.0"
 
-  s.add_development_dependency 'devise', '~> 3.2'
-  s.add_development_dependency 'jquery-ui-rails', '~> 4.2'
-  s.add_development_dependency 'sass-rails', '~> 4.0'
-  s.add_development_dependency 'uglifier', '~> 1.3'
-  s.add_development_dependency 'coffee-rails', '~> 4.0'
-  s.add_development_dependency 'turbolinks', "~> 2.2"
-  s.add_development_dependency 'jbuilder', '~> 1.2'
-  s.add_development_dependency 'jquery-validation-rails', '~> 1.12'
-  s.add_development_dependency 'therubyracer', '~> 0.12'
+  #s.add_development_dependency 'devise', '~> 3.2'
+  #s.add_development_dependency 'jquery-ui-rails', '~> 4.2'
+  #s.add_development_dependency 'sass-rails', '~> 4.0'
+  #s.add_development_dependency 'uglifier', '~> 1.3'
+  #s.add_development_dependency 'coffee-rails', '~> 4.0'
+  #s.add_development_dependency 'turbolinks', "~> 2.2"
+  #s.add_development_dependency 'jbuilder', '~> 1.2'
+  #s.add_development_dependency 'jquery-validation-rails', '~> 1.12'
+  #s.add_development_dependency 'therubyracer', '~> 0.12'
   s.add_development_dependency "colorize", '~> 0.7'
 
-  s.add_dependency "activemodel", "~> 4.1"
+  s.add_dependency "activemodel", "~> 5.0"
 end

data/lib/active_model_serializers_binary/active_model_serializers_binary.rb

@@ -17,62 +17,99 @@ module ActiveModel
         self.attr_config = {}
 
         def attributes
-          keys = self.attr_config.select{|k, v| v[:virtual]==true}.keys
+          keys = self.attr_config.select{ |k, v| v[:virtual]==true }.keys
           values = keys.map{ |var| self.instance_variable_get("@#{var}") }
-          super.merge(Hash[keys.zip values])
+          (super rescue {}).merge(Hash[keys.zip values])
         end
+
+        def initialize( *args )
+          super rescue super()
+          initialize_serializer
+        end
+
+        def initialize_serializer
+          self.class.add_virtual_attributes self
+        end
+
+        after_initialize :initialize_serializer rescue nil
       end
 
       module ClassMethods
+        def add_virtual_attributes( instance )
+          self.attr_config.each{ |k, v| add_virtual_attribute(instance, k, v) }
+        end
+
+        def add_virtual_attribute( instance, attr_name, attr_value )
+          attr_name = attr_name.to_s
+          if attr_value[:virtual] == true
+            true
+          else
+            if !instance.respond_to? attr_name
+              attr_value[:virtual] = true
+              attr_accessor attr_name
+              true
+            else
+              false
+            end
+          end
+        end
+
         # todo: agrupar parametros en hash (rompe la compatibilidad hacia atras)
-        def serialize_options(attr_name, coder, count=1, length=1, virtual=false, &block )
-          attr_accessor(attr_name) if virtual
+        def serialize_options( attr_name, coder, count=1, length=1, virtual=false, &block )
           self.attr_config.merge!(attr_name.to_s => {:coder => coder, :count => count, :length => length, :block => block, :name => attr_name, :virtual => virtual})
         end
 
+        def serialize_attribute_options( attr_name, options, &block )
+          self.attr_config.merge!(attr_name.to_s => options.merge({ block: block }))
+        end       
+
         def int8( attr_name, options = {}, &block )
-          serialize_options attr_name, DataTypes::Int8, options[:count], options[:length], options[:virtual], &block
+          serialize_attribute_options attr_name, options.merge({coder: DataTypes::Int8}), &block
         end
 
         def int16( attr_name, options = {}, &block )
-          serialize_options attr_name, DataTypes::Int16, options[:count], options[:length], options[:virtual], &block
+          serialize_attribute_options attr_name, options.merge({coder: DataTypes::Int16}), &block
         end
 
         def int32( attr_name, options = {}, &block )
-          serialize_options attr_name, DataTypes::Int32, options[:count], options[:length], options[:virtual], &block
+          serialize_attribute_options attr_name, options.merge({coder: DataTypes::Int32}), &block
         end
 
         def uint8( attr_name, options = {}, &block )
-          serialize_options attr_name, DataTypes::UInt8, options[:count], options[:length], options[:virtual], &block
+          serialize_attribute_options attr_name, options.merge({coder: DataTypes::UInt8}), &block
         end
 
         def uint16( attr_name, options = {}, &block )
-          serialize_options attr_name, DataTypes::UInt16, options[:count], options[:length], options[:virtual], &block
+          serialize_attribute_options attr_name, options.merge({coder: DataTypes::UInt16}), &block
         end
 
         def uint32( attr_name, options = {}, &block )
-          serialize_options attr_name, DataTypes::UInt32, options[:count], options[:length], options[:virtual], &block
+          serialize_attribute_options attr_name, options.merge({coder: DataTypes::UInt32}), &block
         end
 
         def bitfield( attr_name, options = {}, &block )
-          serialize_options attr_name, DataTypes::BitField, options[:count], options[:length], options[:virtual], &block
+          serialize_attribute_options attr_name, options.merge({coder: DataTypes::BitField}), &block
         end
 
         def float32( attr_name, options = {}, &block )
-          serialize_options attr_name, DataTypes::Float32, options[:count], options[:length], options[:virtual], &block
+          serialize_attribute_options attr_name, options.merge({coder: DataTypes::Float32}), &block
         end
 
         def char( attr_name, options = {}, &block )
-          serialize_options attr_name, DataTypes::Char, options[:count], options[:length], options[:virtual], &block
+          serialize_attribute_options attr_name, options.merge({coder: DataTypes::Char}), &block
         end
 
         def bool( attr_name, options = {}, &block )
-          serialize_options attr_name, DataTypes::Bool, options[:count], options[:length], options[:virtual], &block
+          serialize_attribute_options attr_name, options.merge({coder: DataTypes::Bool}), &block
+        end
+
+        def nest( attr_name, options={}, &block )
+          serialize_attribute_options attr_name, options.merge({type: :nest}), &block
         end
       end
 
       class Serializer #:nodoc:
-        attr_reader :options
+        #attr_reader :options
 
         def initialize(serializable, options = nil)
           @serializable = serializable
@@ -80,24 +117,28 @@ module ActiveModel
         end
 
         def dump
-          serializable_values = @serializable.serializable_hash(options)
+          serializable_values = @serializable.serializable_hash(@options)
           start_address = @options[:start_address] || 0
 
-          buffer = [] # Buffer en bytes
-          tmp_buffer = [] # Buffer temporal en bytes
-          current_address = start_address*2 + 0.0 # Dirección en bytes
+          buffer = [] # Data Buffer
+          tmp_buffer = [] # Aux Data Buffer
+          current_address = start_address*2 + 0.0 # Address in bytes
 
-          @serializable.attr_config.each do |key, options|
-            var = options[:coder].new(options.merge(parent: @serializable))
-            # Busca el valor del atributo y si no existe devuelve nil
-            var.value = serializable_values[key] rescue nil
+          @serializable.attr_config.each do |attr_name, attr_options|
+            if attr_options[:type] != :nest
+              var = attr_options[:coder].new(attr_options.merge(parent: @serializable))
+              var.value = serializable_values[attr_name] rescue nil
+            else
+              var = attr_options[:coder].new(serializable_values[attr_name].attributes)
+            end
 
             byte = current_address.floor
             bit = (current_address.modulo(1)*8).round
 
             tmp_buffer = var.dump
+
             if @options[:align]
-              if !var.type.in? [:bitfield, :bool]
+              if !attr_options[:type].in? [:bitfield, :bool, :nest]
                 # Se posiciona al principio de un byte
                 if bit != 0
                   byte += 1
@@ -118,7 +159,7 @@ module ActiveModel
             end
 
             # Si los datos ocupan mas de un byte concatena los arrays
-            if !var.type.in? [:bitfield, :bool] and @options[:align]
+            if !attr_options[:type].in? [:bitfield, :bool] and @options[:align]
               buffer.insert(byte, tmp_buffer).flatten!
             else # En caso de ser bits
               tmp_buffer.flatten!
@@ -145,14 +186,14 @@ module ActiveModel
 
           current_address = start_address*2 + 0.0 # Dirección en bytes
 
-          @serializable.attr_config.each do |key, options|
+          @serializable.attr_config.each do |attr, attr_options|
             byte = current_address.floor
             bit = (current_address.modulo(1)*8).round
 
-            var = options[:coder].new(options.merge(parent: @serializable)) #creo objeto del tipo de dato pasado
+            var = attr_options[:coder].new(attr_options.merge(parent: @serializable)) #creo objeto del tipo de dato pasado
 
             if @options[:align]
-              if !var.type.in? [:bitfield, :bool]
+              if !attr_options[:type].in? [:bitfield, :bool, :nest]
                 # Se posiciona al principio de un byte
                 if bit != 0
                   byte += 1
@@ -173,27 +214,67 @@ module ActiveModel
             end
 
             # Si los datos ocupan mas de un byte, obtiene los bytes completos del buffer original
-            if var.bit_length >= 8 and @options[:align]
+            if !attr_options[:type].in? [:bitfield, :bool] and @options[:align]
               result_deserialized=var.load(buffer.slice(byte, var.size))
             else # En caso de ser bits
               tmp_buffer = buffer.slice(byte, (var.size+bit/8.0).ceil)
               result_deserialized=var.load([tmp_buffer.pack('C*').unpack('b*').first.slice(bit,var.size*8)].pack('b*').unpack('C*'))
             end
-            serialized_values["#{key}"] = result_deserialized.count>1 ? result_deserialized : result_deserialized.first
+
+            if attr_options[:type] == :nest
+              serialized_values["#{attr}"] = result_deserialized
+            else
+              serialized_values["#{attr}"] = result_deserialized.count>1 ? result_deserialized : result_deserialized.first
+            end
             current_address = (byte+bit/8.0)+var.size
           end
 
           # Asigno los datos leidos
           serialized_values.each do |k,v|
-            if @serializable.respond_to? "#{k}="
-              @serializable.send("#{k}=", v)
-            else
-              @serializable.instance_variable_set("@#{k}".to_sym, v)
-            end
+            @serializable.send("#{k}=", v)
           end
           @serializable
         end
 
+        # Return size of object in bytes
+        def size
+          serializable_values = @serializable.serializable_hash(@options)
+          start_address = @options[:start_address] || 0
+
+          current_address = 0.0 # Dirección en bytes
+
+          @serializable.attr_config.each do |attr_name, attr_options|
+            var = attr_options[:coder].new(attr_options.merge(parent: @serializable))
+
+            byte = current_address.floor
+            bit = (current_address.modulo(1)*8).round
+
+            if @options[:align]
+              if !attr_options[:type].in? [:bitfield, :bool, :nest]
+                # Se posiciona al principio de un byte
+                if bit != 0
+                  byte += 1
+                  bit = 0
+                  current_address = (byte+bit/8.0)
+                end
+                # Si el dato es una palabra simple, alinea los datos en el siguiente byte par
+                if var.bit_length > 8 and current_address.modulo(2) != 0
+                  byte += 1
+                  bit = 0
+                end
+                # Si el dato es una palabra doble, alinea los datos en la siguiente palabra par
+                if var.bit_length > 16 and (current_address + start_address*2).modulo(4) != 0
+                  byte += 4-byte%4
+                  bit = 0
+                end
+              end
+            end
+
+            current_address = (byte+bit/8.0)+var.size
+          end
+          current_address-start_address
+        end
+
       end #close class serializer
 
       # Returns a binary array representing the model. Configuration can be
@@ -215,6 +296,8 @@ module ActiveModel
         Serializer.new(self, options).dump
       end
 
+      alias_method :dump, :to_bytes
+
       def to_words(options = {}, &block)
         data = to_bytes(options, &block)
         byte_count = (data.count/2.0).ceil*2
@@ -270,11 +353,21 @@ module ActiveModel
         retVal
       end
 
+      alias_method :load, :from_bytes
+
       def from_words(buffer = [], options = {}, &block)
         data = buffer.pack('v*').unpack('C*')
         from_bytes(data, options, &block)
       end
 
+      def size(options = {})
+        default_options = {
+            :align => true
+        }
+        options = default_options.deep_merge(options)
+        Serializer.new(self, options).size
+      end
+
     end
   end
 end

data/lib/active_model_serializers_binary/base_type.rb

@@ -1,6 +1,6 @@
 module DataTypes
 
-  class Type
+  class BaseType
 
     attr_accessor :raw_value, :bit_length, :type, :sign, :count, :length, :value, :name, :parent
 
@@ -53,6 +53,8 @@ module DataTypes
               v.to_s[0...length]
             when :bool
               (v.in? [1, true]) ? true : false
+            when :nest
+              v
             else
               v.to_i
           end
@@ -78,7 +80,7 @@ module DataTypes
     def check_raw_value(value)
       check(value, {
         :type => :uint8,
-        :count => size,
+        :count => (size < 1 ? 1 : size),
         :length => 1,
         :bit_length => 8,
         :sign => :unsigned,

data/lib/active_model_serializers_binary/data_types.rb

@@ -2,88 +2,88 @@ require_relative 'base_type.rb'
 
 module DataTypes
 
-  class Int8 < Type
+  class Int8 < BaseType
     def initialize(options = {})
       super options.merge :bit_length => 8, :sign => :signed
     end
 
     def dump(value=nil)
-      before_dump( value )
+      before_dump( value ).pack('c*').unpack('C*')
       @raw_value = @value
     end
 
     def load(raw_value)
-      self.value = check_raw_value(raw_value)
+      self.value = check_raw_value(raw_value).pack('C*').unpack('c*')
       after_load
     end
   end
 
-  class Int16 < Type
+  class Int16 < BaseType
     def initialize(options = {})
       super options.merge :bit_length => 16, :sign => :signed
     end
 
     def dump(value=nil)
       before_dump( value )
-      @raw_value = @value.pack('v*').unpack('C*')
+      @raw_value = @value.pack('s<*').unpack('C*')
     end
 
     def load(raw_value)
-      self.value = check_raw_value(raw_value).pack('C*').unpack('v*')
+      self.value = check_raw_value(raw_value).pack('C*').unpack('s<*')
       after_load
     end
   end
 
-  class Int32 < Type
+  class Int32 < BaseType
     def initialize(options = {})
       super options.merge :bit_length => 32, :sign => :signed
     end
 
     def dump(value=nil)
       before_dump( value )
-      @raw_value = @value.pack('V*').unpack('C*')
+      @raw_value = @value.pack('l<*').unpack('C*')
     end
 
     def load(raw_value)
-      self.value = check_raw_value(raw_value).pack('C*').unpack('V*') if !value.nil?
+      self.value = check_raw_value(raw_value).pack('C*').unpack('l<*') if !value.nil?
       after_load
     end
   end
 
-  class UInt16 < Type
+  class UInt16 < BaseType
     def initialize(options = {})
       super options.merge :bit_length => 16, :sign => :unsigned
     end
 
     def dump(value=nil)
       before_dump( value )
-      @raw_value = @value.pack('v*').unpack('C*')
+      @raw_value = @value.pack('S<*').unpack('C*')
     end
 
-    def load(raw_value)
+    def load(raw_value) 
       @raw_value = check_raw_value(raw_value)
-      self.value = @raw_value.pack('C*').unpack('v*')
+      self.value = @raw_value.pack('C*').unpack('S<*')
       after_load
     end
   end
 
-  class UInt32 < Type
+  class UInt32 < BaseType
     def initialize(options = {})
       super options.merge :bit_length => 32, :sign => :unsigned
     end
 
     def dump(value=nil)
       before_dump( value )
-      @raw_value = @value.pack('l*').unpack('C*')
+      @raw_value = @value.pack('L<*').unpack('C*')
     end
 
     def load(raw_value)
-      self.value = check_raw_value(raw_value).pack('C*').unpack('l*') if !value.nil?
+      self.value = check_raw_value(raw_value).pack('C*').unpack('L<*') if !value.nil?
       after_load
     end
   end
 
-  class UInt8 < Type
+  class UInt8 < BaseType
     def initialize(options = {})
       super options.merge :bit_length => 8, :sign => :unsigned
     end
@@ -99,9 +99,9 @@ module DataTypes
     end
   end
 
-  class BitField < Type
+  class BitField < BaseType
     def initialize(options = {})
-      length = 32 if length > 32
+      length = options[:bin_length].blank? ? 1 : (options[:bin_length] > 32 ? 32 : options[:bin_length])
       super options.merge :bit_length => length, :sign => :unsigned
     end
 
@@ -137,7 +137,7 @@ module DataTypes
     end
   end
 
-  class Char < Type
+  class Char < BaseType
     def initialize(options = {})
       super options.merge :bit_length => 8, :sign => nil, :default_value => "\x0"
     end
@@ -153,7 +153,7 @@ module DataTypes
     end
   end
 
-  class Bool < Type
+  class Bool < BaseType
     def initialize(options = {})
       super options.merge :bit_length => 1, :default_value => false
     end
@@ -169,7 +169,7 @@ module DataTypes
     end
   end
 
-  class Float32 < Type
+  class Float32 < BaseType
     def initialize(options = {})
       super options.merge :bit_length => 32, :sign => nil, :default_value => 0.0
     end

data/lib/active_model_serializers_binary/version.rb

@@ -1,3 +1,3 @@
 module ActiveModelSerializersBinary
-  VERSION = "0.0.25"
+  VERSION = "0.1.5"
 end

data/test/dummy/app/models/producto.rb

@@ -5,12 +5,12 @@
 #  id              :integer          not null, primary key
 #  uid             :integer
 #  silo            :integer
-#  nombre          :string(255)
+#  nombre          :string
 #  total_acumulado :integer
 #  bits1           :boolean
 #  bits2           :boolean
 #  ffloat          :float
-#  variable        :string(255)
+#  variable        :string
 #  created_at      :datetime
 #  updated_at      :datetime
 #
@@ -18,29 +18,6 @@
 class Producto < ActiveRecord::Base
 	include ActiveModel::Serializers::Binary
 
-	int16 :uid
-	int16 :silo
 	char :nombre, count: 1, length: 20
-	int32 :total_acumulado
-	bool :bits1
-	bool :bits2
-	bool :bits3, virtual: true
-	bool :bits4, virtual: true
-	bool :bits5, virtual: true
-	bool :bits6, virtual: true
-	bool :bits7, virtual: true
-	bool :bits8, virtual: true
-	bool :bits9, virtual: true
-	bool :bits10, virtual: true
-	bool :bits11, virtual: true
-	bool :bits12, virtual: true
-	bool :bits13, virtual: true
-	bool :bits14, virtual: true
-	bool :bits15, virtual: true
-	bool :bits16, virtual: true
-	float32 :ffloat
-	char :variable, count: 1, length: 20 do |field, mode|
-		puts (mode.to_s + ': variable block').blue
-	end
-	int32 :test, count: 10, virtual: true # No existe en la DB
+	nest :tipo, coder: Tipo
 end

data/test/dummy/app/models/tipo.rb

@@ -0,0 +1,18 @@
+# == Schema Information
+#
+# Table name: tipos
+#
+#  id          :integer          not null, primary key
+#  name        :string
+#  producto_id :integer
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#
+
+class Tipo < ActiveRecord::Base
+	include ActiveModel::Serializers::Binary
+
+	int16 :producto_id
+	char :name, count: 1, length: 20
+
+end

data/test/dummy/config/environments/test.rb

@@ -14,7 +14,7 @@ Rails.application.configure do
 
   # Configure static asset server for tests with Cache-Control for performance.
   config.serve_static_assets  = true
-  config.static_cache_control = 'public, max-age=3600'
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

data/test/dummy/db/migrate/20170817015810_create_tipos.rb

@@ -0,0 +1,9 @@
+class CreateTipos < ActiveRecord::Migration[5.0]
+  def change
+    create_table :tipos do |t|
+      t.string :name
+
+      t.timestamps
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,9 +10,9 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160608024807) do
+ActiveRecord::Schema.define(version: 20170817015810) do
 
-  create_table "productos", force: true do |t|
+  create_table "productos", force: :cascade do |t|
     t.integer  "uid"
     t.integer  "silo"
     t.string   "nombre"
@@ -26,4 +25,12 @@ ActiveRecord::Schema.define(version: 20160608024807) do
     t.datetime "updated_at"
   end
 
+  create_table "tipos", force: :cascade do |t|
+    t.string   "name"
+    t.integer  "producto_id"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
+    t.index ["producto_id"], name: "index_tipos_on_producto_id"
+  end
+
 end

data/test/dummy/lib/test_parser.rb

@@ -8,42 +8,21 @@ class String
 end
 
 orig = Producto.new
-orig.uid = 1
-orig.silo = 0
-orig.nombre = "MAIZ"
-orig.total_acumulado = 50
-orig.bits1 = 1
-orig.bits2 = 0
-orig.bits3 = nil
-orig.bits4 = nil
-orig.bits5 = nil
-orig.bits6 = nil
-orig.bits7 = nil
-orig.bits8 = nil
-orig.bits9 = nil
-orig.bits10 = nil
-orig.bits11 = nil
-orig.bits12 = nil
-orig.bits13 = nil
-orig.bits14 = nil
-orig.bits15 = nil
-orig.bits16 = nil
-orig.ffloat= 1.2345678
-orig.variable = '012345678901234567890123456789'
-orig.test = (1..10).to_a
+orig.nombre = "AAAAAAAAAAAAAAAAAAAA"
+orig.tipo = Tipo.new({name:"BBBBBBBBBBBBBBBBBBBB", producto_id: 0x55AA})
 
 puts 'Datos originales...'
 puts orig.inspect.green
 
 puts 'serializando...'
-serial = orig.to_bytes do |b|
-	puts 'to_bytes block'.blue
-end
+serial = orig.to_bytes 
 
 puts serial.inspect.yellow
 
 puts 'deserializando...'
-deser = Producto.new.from_bytes serial do |b|
-	puts 'from_bytes block'.blue
-end
-puts deser.inspect.green
+deser = Producto.new.from_bytes serial
+puts deser.inspect.green
+
+must_be_equal = (serial <=> deser.to_bytes) === 0
+puts "Test OK".green if must_be_equal
+puts "Test fail".red unless must_be_equal

data/test/dummy/test/fixtures/productos.yml

@@ -5,12 +5,12 @@
 #  id              :integer          not null, primary key
 #  uid             :integer
 #  silo            :integer
-#  nombre          :string(255)
+#  nombre          :string
 #  total_acumulado :integer
 #  bits1           :boolean
 #  bits2           :boolean
 #  ffloat          :float
-#  variable        :string(255)
+#  variable        :string
 #  created_at      :datetime
 #  updated_at      :datetime
 #

data/test/dummy/test/fixtures/tipos.yml

@@ -0,0 +1,20 @@
+# == Schema Information
+#
+# Table name: tipos
+#
+#  id          :integer          not null, primary key
+#  name        :string
+#  producto_id :integer
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#
+
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  name: MyString
+  producto: one
+
+two:
+  name: MyString
+  producto: two

data/test/dummy/test/models/producto_test.rb

@@ -5,12 +5,12 @@
 #  id              :integer          not null, primary key
 #  uid             :integer
 #  silo            :integer
-#  nombre          :string(255)
+#  nombre          :string
 #  total_acumulado :integer
 #  bits1           :boolean
 #  bits2           :boolean
 #  ffloat          :float
-#  variable        :string(255)
+#  variable        :string
 #  created_at      :datetime
 #  updated_at      :datetime
 #

data/test/dummy/test/models/tipo_test.rb

@@ -0,0 +1,18 @@
+# == Schema Information
+#
+# Table name: tipos
+#
+#  id          :integer          not null, primary key
+#  name        :string
+#  producto_id :integer
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#
+
+require 'test_helper'
+
+class TipoTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_model_serializers_binary
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.1.5
 platform: ruby
 authors:
 - ByS Sistemas de Control
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,156 +42,30 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
-- !ruby/object:Gem::Dependency
-  name: devise
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: jquery-ui-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: sass-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: uglifier
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: turbolinks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: jbuilder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: jquery-validation-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-- !ruby/object:Gem::Dependency
-  name: therubyracer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
 description: active_model_serializers_binary is a declarative way to serialize/deserialize
   ActiveModel classes for raw data exchange.
 email:
@@ -255,6 +129,7 @@ files:
 - test/dummy/app/models/.keep
 - test/dummy/app/models/concerns/.keep
 - test/dummy/app/models/producto.rb
+- test/dummy/app/models/tipo.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
@@ -279,6 +154,7 @@ files:
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
 - test/dummy/db/migrate/20160608024807_create_productos.rb
+- test/dummy/db/migrate/20170817015810_create_tipos.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.keep
 - test/dummy/lib/test_parser.rb
@@ -288,7 +164,9 @@ files:
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/dummy/test/fixtures/productos.yml
+- test/dummy/test/fixtures/tipos.yml
 - test/dummy/test/models/producto_test.rb
+- test/dummy/test/models/tipo_test.rb
 - test/test_helper.rb
 homepage: https://github.com/bys-control/active_model_serializers_binary
 licenses:
@@ -310,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Serialize models to/from binary format for raw data exchange
@@ -328,6 +206,7 @@ test_files:
 - test/dummy/app/models/.keep
 - test/dummy/app/models/concerns/.keep
 - test/dummy/app/models/producto.rb
+- test/dummy/app/models/tipo.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
@@ -352,6 +231,7 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
 - test/dummy/db/migrate/20160608024807_create_productos.rb
+- test/dummy/db/migrate/20170817015810_create_tipos.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.keep
 - test/dummy/lib/test_parser.rb
@@ -361,6 +241,7 @@ test_files:
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/dummy/test/fixtures/productos.yml
+- test/dummy/test/fixtures/tipos.yml
 - test/dummy/test/models/producto_test.rb
+- test/dummy/test/models/tipo_test.rb
 - test/test_helper.rb
-has_rdoc: