active_model_serializers_binary 0.0.13 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f3830d0d3a2a18ae95bb47c427e1af2ea6d2d86
-  data.tar.gz: 546aff445bb2ec63c9734955c762f3a87029b4b3
+  metadata.gz: 0a481a565f5e643a79745f877c5b5ee262e44f86
+  data.tar.gz: ad2610cd3717c694f67ba9911579b4f0a47e87b7
 SHA512:
-  metadata.gz: 92274b86db2b91c5085e29e659279428d0221b1bd3bcfd4c9f650de4d32db55800887e22919261fea282960ac87efed344844da28a3955386848ece83e2c4509
-  data.tar.gz: 272721accba6bd385c4b1c967afd42af2a155e132c4c807d69752bb4673e05cbb6d72da8f64cf0f3767cbbfc0e5ea9797c12db564d655fed3d29436b944976de
+  metadata.gz: 98c03ce80bc8c768195b236ca904185e2e408a6c4b905e22228798482ff67607fad999d313514d25c9a94f15aa62ca12ffe269ea628c50e09317c3c2ca6783c0
+  data.tar.gz: 3a8d735b73f56e7c4eadbdf35714608987baaedb3e29a610d6bfa2e98b0a1c19b9ed8f7f00dbe60c3760774e01ad8cbac817df3308325fb1f9a0605981e83af7

data/Gemfile

@@ -21,4 +21,5 @@ group :development do
 
   #debuggers
   gem 'pry-byebug'
+  gem 'annotate'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_model_serializers_binary (0.0.12)
+    active_model_serializers_binary (0.0.24)
       activemodel (~> 4.1)
 
 GEM
@@ -33,6 +33,9 @@ GEM
       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)
     builder (3.2.2)
@@ -155,6 +158,7 @@ PLATFORMS
 
 DEPENDENCIES
   active_model_serializers_binary!
+  annotate
   bundler (~> 1.6)
   coffee-rails (~> 4.0)
   colorize (~> 0.7)

data/active_model_serializers_binary.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.email       = ["info@bys-control.com.ar"]
   s.homepage    = "https://github.com/bys-control/active_model_serializers_binary"
   s.summary     = "Serialize models to/from binary format for raw data exchange"
-  s.description = "Binary serializer for Ruby Active Model"
+  s.description = "active_model_serializers_binary is a declarative way to serialize/deserialize ActiveModel classes for raw data exchange."
   s.license     = "MIT"
 
   s.files = `git ls-files -z`.split("\x0")

data/lib/active_model_serializers_binary/active_model_serializers_binary.rb

@@ -16,58 +16,58 @@ module ActiveModel
         class_attribute :attr_config
         self.attr_config = {}
 
-        def initialize
-          super
-          self.attr_config.each do |key, options|
-            options[:parent] = self
-          end
+        def attributes
+          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])
         end
       end
 
       module ClassMethods
         # todo: agrupar parametros en hash (rompe la compatibilidad hacia atras)
-        def serialize_options(attr_name, coder, count=1, length=1, &block )
-          self.attr_config.merge!(attr_name.to_s => {:coder => coder, :count => count, :length => length, :block => block, :name => attr_name})
+        def serialize_options(attr_name, coder, count=1, length=1, virtual=false, &block )
+          attr_accessor(attr_name) if virtual
+          self.attr_config.merge!(attr_name.to_s => {:coder => coder, :count => count, :length => length, :block => block, :name => attr_name, :virtual => virtual})
         end
 
         def int8( attr_name, options = {}, &block )
-          serialize_options attr_name, DataTypes::Int8, options[:count], options[:length], &block
+          serialize_options attr_name, DataTypes::Int8, options[:count], options[:length], options[:virtual], &block
         end
 
         def int16( attr_name, options = {}, &block )
-          serialize_options attr_name, DataTypes::Int16, options[:count], options[:length], &block
+          serialize_options attr_name, DataTypes::Int16, options[:count], options[:length], options[:virtual], &block
         end
 
         def int32( attr_name, options = {}, &block )
-          serialize_options attr_name, DataTypes::Int32, options[:count], options[:length], &block
+          serialize_options attr_name, DataTypes::Int32, options[:count], options[:length], options[:virtual], &block
         end
 
         def uint8( attr_name, options = {}, &block )
-          serialize_options attr_name, DataTypes::UInt8, options[:count], options[:length], &block
+          serialize_options attr_name, DataTypes::UInt8, options[:count], options[:length], options[:virtual], &block
         end
 
         def uint16( attr_name, options = {}, &block )
-          serialize_options attr_name, DataTypes::UInt16, options[:count], options[:length], &block
+          serialize_options attr_name, DataTypes::UInt16, options[:count], options[:length], options[:virtual], &block
         end
 
         def uint32( attr_name, options = {}, &block )
-          serialize_options attr_name, DataTypes::UInt32, options[:count], options[:length], &block
+          serialize_options attr_name, DataTypes::UInt32, options[:count], options[:length], options[:virtual], &block
         end
 
         def bitfield( attr_name, options = {}, &block )
-          serialize_options attr_name, DataTypes::BitField, options[:count], options[:length], &block
+          serialize_options attr_name, DataTypes::BitField, options[:count], options[:length], options[:virtual], &block
         end
 
         def float32( attr_name, options = {}, &block )
-          serialize_options attr_name, DataTypes::Float32, options[:count], options[:length], &block
+          serialize_options attr_name, DataTypes::Float32, options[:count], options[:length], options[:virtual], &block
         end
 
         def char( attr_name, options = {}, &block )
-          serialize_options attr_name, DataTypes::Char, options[:count], options[:length], &block
+          serialize_options attr_name, DataTypes::Char, options[:count], options[:length], options[:virtual], &block
         end
 
         def bool( attr_name, options = {}, &block )
-          serialize_options attr_name, DataTypes::Bool, options[:count], options[:length], &block
+          serialize_options attr_name, DataTypes::Bool, options[:count], options[:length], options[:virtual], &block
         end
       end
 
@@ -88,7 +88,7 @@ module ActiveModel
           current_address = start_address*2 + 0.0 # Dirección en bytes
 
           @serializable.attr_config.each do |key, options|
-            var = options[:coder].new(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
 
@@ -96,7 +96,6 @@ module ActiveModel
             bit = (current_address.modulo(1)*8).round
 
             tmp_buffer = var.dump
-
             if @options[:align]
               if !var.type.in? [:bitfield, :bool]
                 # Se posiciona al principio de un byte
@@ -147,11 +146,10 @@ module ActiveModel
           current_address = start_address*2 + 0.0 # Dirección en bytes
 
           @serializable.attr_config.each do |key, options|
-            #puts "#{key} - #{options}"
             byte = current_address.floor
             bit = (current_address.modulo(1)*8).round
 
-            var = options[:coder].new(options) #creo objeto del tipo de dato pasado
+            var = options[:coder].new(options.merge(parent: @serializable)) #creo objeto del tipo de dato pasado
 
             if @options[:align]
               if !var.type.in? [:bitfield, :bool]
@@ -181,22 +179,18 @@ module ActiveModel
               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
-            # puts result_deserialized.inspect
             serialized_values["#{key}"] = result_deserialized.count>1 ? result_deserialized : result_deserialized.first
             current_address = (byte+bit/8.0)+var.size
           end
 
-          # if !@serializable.instance_variable_get(:@attributes).nil?
-          #   @serializable.instance_variable_get(:@attributes).merge!(serialized_values) rescue nil
-          # else
-            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
+          # 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
-          #end
+          end
           @serializable
         end
 
@@ -221,6 +215,12 @@ module ActiveModel
         Serializer.new(self, options).dump
       end
 
+      def to_words(options = {}, &block)
+        data = to_bytes(options, &block)
+        byte_count = (data.count/2.0).ceil*2
+        data.fill(0, data.count...byte_count).pack('C*').unpack('v*')
+      end
+
       # Sets the model +attributes+ from an Binary string. Returns +self+.
       #
       #   class Person
@@ -269,6 +269,12 @@ module ActiveModel
         end
         retVal
       end
+
+      def from_words(buffer, options = {}, &block)
+        data = buffer.pack('v*').unpack('C*')
+        from_bytes(data, options, &block)
+      end
+
     end
   end
 end

data/lib/active_model_serializers_binary/base_type.rb

@@ -5,7 +5,7 @@ module DataTypes
     attr_accessor :raw_value, :bit_length, :type, :sign, :count, :length, :value, :name, :parent
 
     def initialize(options = {})
-      @default_value = options[:default_value] || 0
+      @default_value = options[:default_value].nil? ? 0 : options[:default_value]
       @raw_value = nil
       @bit_length = options[:bit_length]        # Cantidad de bits del tipo de dato
       @type = type
@@ -28,7 +28,7 @@ module DataTypes
 
     # Return size of object in bytes
     def size
-      ((@bit_length*@length*@count)/8.0).ceil
+      (@bit_length*@length*@count)/8.0
     end
 
     def check( value, options = {} )
@@ -52,7 +52,7 @@ module DataTypes
             when :char
               v.to_s[0...length]
             when :bool
-              (v.in? [0, false]) ? false : true
+              (v.in? [1, true]) ? true : false
             else
               v.to_i
           end
@@ -115,8 +115,8 @@ module DataTypes
       self.value = value if !value.nil?
       if !@block.nil?
         value = @parent.instance_exec( self, :dump, &@block )
-        self.value = value if !value.nil?
       end
+      self.value = value if !value.nil?
     end
 
     #
@@ -127,8 +127,7 @@ module DataTypes
     # 
     def after_load
       if !@block.nil?
-        value = @parent.instance_exec( self, :load, &@block )
-        self.value = value if !value.nil?
+        @parent.instance_exec( self, :load, &@block )
       end
       @value
     end

data/lib/active_model_serializers_binary/version.rb

@@ -1,3 +1,3 @@
 module ActiveModelSerializersBinary
-  VERSION = "0.0.13"
+  VERSION = "0.0.24"
 end

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

@@ -0,0 +1,46 @@
+# == Schema Information
+#
+# Table name: productos
+#
+#  id              :integer          not null, primary key
+#  uid             :integer
+#  silo            :integer
+#  nombre          :string(255)
+#  total_acumulado :integer
+#  bits1           :boolean
+#  bits2           :boolean
+#  ffloat          :float
+#  variable        :string(255)
+#  created_at      :datetime
+#  updated_at      :datetime
+#
+
+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
+end

data/test/dummy/db/migrate/20160608024807_create_productos.rb

@@ -0,0 +1,16 @@
+class CreateProductos < ActiveRecord::Migration
+  def change
+    create_table :productos do |t|
+      t.integer :uid
+      t.integer :silo
+      t.string :nombre
+      t.integer :total_acumulado
+      t.boolean :bits1
+      t.boolean :bits2
+      t.float :ffloat
+      t.string :variable
+
+      t.timestamps
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -0,0 +1,29 @@
+# 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.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20160608024807) do
+
+  create_table "productos", force: true do |t|
+    t.integer  "uid"
+    t.integer  "silo"
+    t.string   "nombre"
+    t.integer  "total_acumulado"
+    t.boolean  "bits1"
+    t.boolean  "bits2"
+    t.float    "ffloat"
+    t.string   "variable"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+end

data/test/dummy/lib/test_parser.rb

@@ -7,54 +7,30 @@ class String
   end
 end
 
-class Producto
-	include ActiveModel::Serializers::Binary
-
-	attr_accessor :start_address, :id, :silo, :nombre, :total_acumulado, :bits1, :bits2, :float, :total_acumulado_1, :variable
-
-    def attributes
-    	instance_values
-    end
-
-	def attributes=(hash)
-		hash.each do |key, value|
-			instance_variable_set("@#{key}", value)
-		end
-	end
-
-	# def metodo
-	# 	self.instance_variable_get("@variable")
-	# end
-
-	# def metodo= (value)
-	# 	self.instance_variable_set("@variable", value)
-	# end
-
-	int16 :id
-	int16 :silo
-	char :nombre, count: 1, length: 20
-	int32 :total_acumulado
-	bool :bits1
-	bool :bits2
-	int32 :total_acumulado_1
-	float32 :float
-	char :variable, count: 1, length: 20 do |field, mode|
-		puts (mode.to_s + ': variable block').blue
-	end
-end
-
-
 orig = Producto.new
-orig.start_address = 0
-orig.id = 1
+orig.uid = 1
 orig.silo = 0
 orig.nombre = "MAIZ"
 orig.total_acumulado = 50
 orig.bits1 = 1
-orig.bits2 = 1
-orig.total_acumulado_1 = 20
-orig.float= 1.2345678
+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
 
 puts 'Datos originales...'
 puts orig.inspect.green

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

@@ -0,0 +1,38 @@
+# == Schema Information
+#
+# Table name: productos
+#
+#  id              :integer          not null, primary key
+#  uid             :integer
+#  silo            :integer
+#  nombre          :string(255)
+#  total_acumulado :integer
+#  bits1           :boolean
+#  bits2           :boolean
+#  ffloat          :float
+#  variable        :string(255)
+#  created_at      :datetime
+#  updated_at      :datetime
+#
+
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  id: 1
+  silo: 1
+  nombre: MyString
+  total_acumulado: 1
+  bits1: false
+  bits2: false
+  ffloat: 1.5
+  variable: MyString
+
+two:
+  id: 1
+  silo: 1
+  nombre: MyString
+  total_acumulado: 1
+  bits1: false
+  bits2: false
+  ffloat: 1.5
+  variable: MyString

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

@@ -0,0 +1,24 @@
+# == Schema Information
+#
+# Table name: productos
+#
+#  id              :integer          not null, primary key
+#  uid             :integer
+#  silo            :integer
+#  nombre          :string(255)
+#  total_acumulado :integer
+#  bits1           :boolean
+#  bits2           :boolean
+#  ffloat          :float
+#  variable        :string(255)
+#  created_at      :datetime
+#  updated_at      :datetime
+#
+
+require 'test_helper'
+
+class ProductoTest < 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.13
+  version: 0.0.24
 platform: ruby
 authors:
 - ByS Sistemas de Control
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -220,7 +220,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
-description: Binary serializer for Ruby Active Model
+description: active_model_serializers_binary is a declarative way to serialize/deserialize
+  ActiveModel classes for raw data exchange.
 email:
 - info@bys-control.com.ar
 executables: []
@@ -253,6 +254,7 @@ files:
 - test/dummy/app/mailers/.keep
 - test/dummy/app/models/.keep
 - test/dummy/app/models/concerns/.keep
+- test/dummy/app/models/producto.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
@@ -276,6 +278,8 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
+- test/dummy/db/migrate/20160608024807_create_productos.rb
+- test/dummy/db/schema.rb
 - test/dummy/lib/assets/.keep
 - test/dummy/lib/test_parser.rb
 - test/dummy/log/.keep
@@ -283,6 +287,8 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/dummy/test/fixtures/productos.yml
+- test/dummy/test/models/producto_test.rb
 - test/test_helper.rb
 homepage: https://github.com/bys-control/active_model_serializers_binary
 licenses:
@@ -321,6 +327,7 @@ test_files:
 - test/dummy/app/mailers/.keep
 - test/dummy/app/models/.keep
 - test/dummy/app/models/concerns/.keep
+- test/dummy/app/models/producto.rb
 - test/dummy/app/views/layouts/application.html.erb
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
@@ -344,6 +351,8 @@ test_files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
+- test/dummy/db/migrate/20160608024807_create_productos.rb
+- test/dummy/db/schema.rb
 - test/dummy/lib/assets/.keep
 - test/dummy/lib/test_parser.rb
 - test/dummy/log/.keep
@@ -351,5 +360,7 @@ test_files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/dummy/test/fixtures/productos.yml
+- test/dummy/test/models/producto_test.rb
 - test/test_helper.rb
 has_rdoc: