active_model_serializers_binary 0.2.0 → 0.3.1

data/lib/active_model_serializers_binary/data_types.rb

@@ -1,251 +1,262 @@
-require_relative 'base_type.rb'
-
-module DataTypes
-
-  class Int8 < BaseType
-    def initialize(options = {})
-      super options.merge :bit_length => 8, :sign => :signed
-    end
-
-    def dump(value=nil)
-      before_dump( value ).pack('c*').unpack('C*')
-      @raw_value = @value
-    end
-
-    def load(raw_value)
-      self.value = check_raw_value(raw_value).pack('C*').unpack('c*')
-      after_load
-    end
-  end
-
-  class Int16 < BaseType
-    def initialize(options = {})
-      super options.merge :bit_length => 16, :sign => :signed
-    end
-
-    def dump(value=nil)
-      before_dump( value )
-      if @endianess == :big
-        @raw_value = @value.pack('s>*').unpack('C*')
-      else
-        @raw_value = @value.pack('s<*').unpack('C*')
-      end
-    end
-
-    def load(raw_value)
-      if @endianess == :big
-        self.value = check_raw_value(raw_value).pack('C*').unpack('s>*')
-      else
-        self.value = check_raw_value(raw_value).pack('C*').unpack('s<*')
-      end
-      after_load
-    end
-  end
-
-  class Int32 < BaseType
-    def initialize(options = {})
-      super options.merge :bit_length => 32, :sign => :signed
-    end
-
-    def dump(value=nil)
-      before_dump( value )
-      if @endianess == :big
-        @raw_value = @value.pack('l>*').unpack('C*')
-      else
-        @raw_value = @value.pack('l<*').unpack('C*')
-      end
-    end
-
-    def load(raw_value)
-      if @endianess == :big
-        self.value = check_raw_value(raw_value).pack('C*').unpack('l>*') if !value.nil?
-      else
-        self.value = check_raw_value(raw_value).pack('C*').unpack('l<*') if !value.nil?
-      end
-      after_load
-    end
-  end
-
-  class UInt16 < BaseType
-    def initialize(options = {})
-      super options.merge :bit_length => 16, :sign => :unsigned
-    end
-
-    def dump(value=nil)
-      before_dump( value )
-      if @endianess == :big
-        @raw_value = @value.pack('S>*').unpack('C*')
-      else
-        @raw_value = @value.pack('S<*').unpack('C*')
-      end
-    end
-
-    def load(raw_value) 
-      @raw_value = check_raw_value(raw_value)
-      if @endianess == :big
-        self.value = @raw_value.pack('C*').unpack('S>*')
-      else
-        self.value = @raw_value.pack('C*').unpack('S<*')
-      end
-      after_load
-    end
-  end
-
-  class UInt32 < BaseType
-    def initialize(options = {})
-      super options.merge :bit_length => 32, :sign => :unsigned
-    end
-
-    def dump(value=nil)
-      before_dump( value )
-      if @endianess == :big
-        @raw_value = @value.pack('L>*').unpack('C*')
-      else
-        @raw_value = @value.pack('L<*').unpack('C*')
-      end
-    end
-
-    def load(raw_value)
-      if @endianess == :big
-        self.value = check_raw_value(raw_value).pack('C*').unpack('L>*') if !value.nil?
-      else
-        self.value = check_raw_value(raw_value).pack('C*').unpack('L<*') if !value.nil?
-      end
-      after_load
-    end
-  end
-
-  class UInt8 < BaseType
-    def initialize(options = {})
-      super options.merge :bit_length => 8, :sign => :unsigned
-    end
-
-    def dump(value=nil)
-      before_dump( value )
-      @raw_value = @value
-    end
-
-    def load(raw_value)
-      self.value = check_raw_value(raw_value)
-      after_load
-    end
-  end
-
-  class BitField < BaseType
-    def initialize(options = {})
-      length = options[:bin_length].blank? ? 1 : (options[:bin_length] > 32 ? 32 : options[:bin_length])
-      super options.merge :bit_length => length, :sign => :unsigned
-    end
-
-    def format
-      if bit_length <= 8 # 8 bits
-        'C*'
-      elsif bit_length <= 16 # 16 bits
-        'v*'
-      else # 32 bits
-        'l*'
-      end
-    end
-
-    def word_length
-      if bit_length <= 8 # 8 bits
-        8
-      elsif bit_length <= 16 # 16 bits
-        16
-      else # 32 bits
-        32
-      end
-    end
-
-    def dump(value=nil)
-      before_dump( value )
-      data = @value.pack(format).unpack('b*').first.chars.each_slice(word_length).map(&:join).map{|n| n.slice(0,bit_length)}
-      @raw_value = [data.join].pack('b*').unpack('C*')
-    end
-
-    def load(raw_value)
-      self.value = check_raw_value(raw_value).pack('C*').unpack('b*').first.chars.slice(0,@bit_length*@count).each_slice(bit_length).map(&:join).map{|n| [n].pack('b*').unpack('C*').first}
-      after_load
-    end
-  end
-
-  class Char < BaseType
-    def initialize(options = {})
-      super options.merge :bit_length => 8, :sign => nil, :default_value => "\x0"
-    end
-
-    def dump(value=nil)
-      before_dump( value )
-      @raw_value = @value.map{|v| v.ljust(@length, @default_value).slice(0,@length).unpack('C*')}
-    end
-
-    def load(raw_value)
-      self.value = check_raw_value(raw_value).pack('C*').unpack("Z#{@length}") if !value.nil?
-      after_load
-    end
-  end
-
-  class Bool < BaseType
-    def initialize(options = {})
-      super options.merge :bit_length => 1, :default_value => false
-    end
-
-    def dump(value=nil)
-      before_dump( value )
-      @raw_value = Array(@value.map{|v| v ? 1 : 0}.join).pack('b*').unpack('C*')
-    end
-
-    def load(raw_value)
-      self.value = check_raw_value(raw_value).pack('C*').unpack('b*').first.slice(0,size*8).split('').map(&:to_i) if !value.nil?
-      after_load
-    end
-  end
-
-  class Float32 < BaseType
-    def initialize(options = {})
-      super options.merge :bit_length => 32, :sign => nil, :default_value => 0.0
-    end
-
-    def dump(value=nil)
-      before_dump( value )
-      if @endianess == :big
-        @raw_value = @value.pack('g*').unpack('C*')
-      else
-        @raw_value = @value.pack('e*').unpack('C*')
-      end
-    end
-
-    def load(raw_value)
-      if @endianess == :big
-        self.value = check_raw_value(raw_value).pack('C*').unpack('g*') if !value.nil?
-      else
-        self.value = check_raw_value(raw_value).pack('C*').unpack('e*') if !value.nil?
-      end
-      after_load
-    end
-  end
-
-  class Float64 < BaseType
-    def initialize(options = {})
-      super options.merge :bit_length => 64, :sign => nil, :default_value => 0.0
-    end
-
-    def dump(value=nil)
-      before_dump( value )
-      if @endianess == :big
-        @raw_value = @value.pack('G*').unpack('C*')
-      else
-        @raw_value = @value.pack('E*').unpack('C*')
-      end
-    end
-
-    def load(raw_value)
-      if @endianess == :big
-        self.value = check_raw_value(raw_value).pack('C*').unpack('G*') if !value.nil?
-      else
-        self.value = check_raw_value(raw_value).pack('C*').unpack('E*') if !value.nil?
-      end
-      after_load
-    end
-  end
+require_relative 'base_type.rb'
+
+module DataTypes
+
+  class Int8 < BaseType
+    def initialize(options = {})
+      super options.merge :bit_length => 8, :sign => :signed
+    end
+
+    def dump(value=nil)
+      before_dump( value )
+      @raw_value = @value.pack('c*').unpack('C*')
+    end
+
+    def load(raw_value)
+      self.value = check_raw_value(raw_value).pack('C*').unpack('c*')
+      after_load
+    end
+  end
+
+  class Int16 < BaseType
+    def initialize(options = {})
+      super options.merge :bit_length => 16, :sign => :signed
+    end
+
+    def dump(value=nil)
+      before_dump( value )
+      if @endianess == :big
+        @raw_value = @value.pack('s>*').unpack('C*')
+      else
+        @raw_value = @value.pack('s<*').unpack('C*')
+      end
+    end
+
+    def load(raw_value)
+      if @endianess == :big
+        self.value = check_raw_value(raw_value).pack('C*').unpack('s>*')
+      else
+        self.value = check_raw_value(raw_value).pack('C*').unpack('s<*')
+      end
+      after_load
+    end
+  end
+
+  class Int32 < BaseType
+    def initialize(options = {})
+      super options.merge :bit_length => 32, :sign => :signed
+    end
+
+    def dump(value=nil)
+      before_dump( value )
+      if @endianess == :big
+        @raw_value = @value.pack('l>*').unpack('C*')
+      else
+        @raw_value = @value.pack('l<*').unpack('C*')
+      end
+    end
+
+    def load(raw_value)
+      if @endianess == :big
+        self.value = check_raw_value(raw_value).pack('C*').unpack('l>*') if !value.nil?
+      else
+        self.value = check_raw_value(raw_value).pack('C*').unpack('l<*') if !value.nil?
+      end
+      after_load
+    end
+  end
+
+  class UInt16 < BaseType
+    def initialize(options = {})
+      super options.merge :bit_length => 16, :sign => :unsigned
+    end
+
+    def dump(value=nil)
+      before_dump( value )
+      if @endianess == :big
+        @raw_value = @value.pack('S>*').unpack('C*')
+      else
+        @raw_value = @value.pack('S<*').unpack('C*')
+      end
+    end
+
+    def load(raw_value) 
+      @raw_value = check_raw_value(raw_value)
+      if @endianess == :big
+        self.value = @raw_value.pack('C*').unpack('S>*')
+      else
+        self.value = @raw_value.pack('C*').unpack('S<*')
+      end
+      after_load
+    end
+  end
+
+  class UInt32 < BaseType
+    def initialize(options = {})
+      super options.merge :bit_length => 32, :sign => :unsigned
+    end
+
+    def dump(value=nil)
+      before_dump( value )
+      if @endianess == :big
+        @raw_value = @value.pack('L>*').unpack('C*')
+      else
+        @raw_value = @value.pack('L<*').unpack('C*')
+      end
+    end
+
+    def load(raw_value)
+      if @endianess == :big
+        self.value = check_raw_value(raw_value).pack('C*').unpack('L>*') if !value.nil?
+      else
+        self.value = check_raw_value(raw_value).pack('C*').unpack('L<*') if !value.nil?
+      end
+      after_load
+    end
+  end
+
+  class UInt8 < BaseType
+    def initialize(options = {})
+      super options.merge :bit_length => 8, :sign => :unsigned
+    end
+
+    def dump(value=nil)
+      before_dump( value )
+      @raw_value = @value
+    end
+
+    def load(raw_value)
+      self.value = check_raw_value(raw_value)
+      after_load
+    end
+  end
+
+  class BitField < BaseType
+    def initialize(options = {})
+      length = options[:bin_length].blank? ? 1 : (options[:bin_length] > 32 ? 32 : options[:bin_length])
+      super options.merge :bit_length => length, :sign => :unsigned
+    end
+
+    def format
+      if bit_length <= 8 # 8 bits
+        'C*'
+      elsif bit_length <= 16 # 16 bits
+        'v*'
+      else # 32 bits
+        'l*'
+      end
+    end
+
+    def word_length
+      if bit_length <= 8 # 8 bits
+        8
+      elsif bit_length <= 16 # 16 bits
+        16
+      else # 32 bits
+        32
+      end
+    end
+
+    def dump(value=nil)
+      before_dump( value )
+      data = @value.pack(format).unpack('b*').first.chars.each_slice(word_length).map(&:join).map{|n| n.slice(0,bit_length)}
+      @raw_value = [data.join].pack('b*').unpack('C*')
+    end
+
+    def load(raw_value)
+      self.value = check_raw_value(raw_value).pack('C*').unpack('b*').first.chars.slice(0,@bit_length*@count).each_slice(bit_length).map(&:join).map{|n| [n].pack('b*').unpack('C*').first}
+      after_load
+    end
+  end
+
+  class Char < BaseType
+    def initialize(options = {})
+      super options.merge :bit_length => 8, :sign => nil, :default_value => "\x0"
+    end
+
+    EXTENDED_CHARACTERS = ["Ç","ü","é","â","ä","à","å","ç","ê","ë","è","ï","î","ì","Ä","Å","É","æ","Æ","ô","ö","ò","û","ù","ÿ","Ö","Ü","ø","£","Ø","×","ƒ","á","í","ó","ú","ñ","Ñ","ª","º","¿","®","¬","½","¼","¡","«","»","░","▒","▓","│","┤","Á","Â","À","©","╣","║","╗","╝","¢","¥","┐","└","┴","┬","├","─","┼","ã","Ã","╚","╔","╩","╦","╠","═","╬","¤","ð","Ð","Ê","Ë","È","ı","Í","Î","Ï","┘","┌","█","▄","¦","Ì","▀","Ó","ß","Ô","Ò","õ","Õ","µ","þ","Þ","Ú","Û","Ù","ý","Ý","¯","´","≡","±","‗","¾","¶","§","÷","¸","°","¨","·","¹","³","²","■"," "]
+    ASCII_TO_UTF8=["",('?'*31).split(''),(32..126).to_a.pack("U*").split(''),"?", EXTENDED_CHARACTERS].flatten
+
+    def dump(value=nil) # to bytes
+      before_dump( value )
+      @raw_value = @value.map{|v| v.ljust(@length, @default_value).slice(0,@length)}.first.split("").map{|x| x=="\u0000" ? 0 : ASCII_TO_UTF8.index(x)}
+      @raw_value
+    end
+
+    def load(raw_value) # from bytes       
+      if !value.nil?
+        characters = []
+        check_raw_value(raw_value).each do |x|
+          break if x == 0
+          characters << ASCII_TO_UTF8[x]
+        end
+        self.value = characters.empty? ? "" : characters.join[0...@length]
+      end
+      after_load
+    end
+  end
+
+  class Bool < BaseType
+    def initialize(options = {})
+      super options.merge :bit_length => 1, :default_value => false
+    end
+
+    def dump(value=nil)
+      before_dump( value )
+      @raw_value = Array(@value.map{|v| v ? 1 : 0}.join).pack('b*').unpack('C*')
+    end
+
+    def load(raw_value)
+      self.value = check_raw_value(raw_value).pack('C*').unpack('b*').first.slice(0,size*8).split('').map(&:to_i) if !value.nil?
+      after_load
+    end
+  end
+
+  class Float32 < BaseType
+    def initialize(options = {})
+      super options.merge :bit_length => 32, :sign => nil, :default_value => 0.0
+    end
+
+    def dump(value=nil)
+      before_dump( value )
+      if @endianess == :big
+        @raw_value = @value.pack('g*').unpack('C*')
+      else
+        @raw_value = @value.pack('e*').unpack('C*')
+      end
+    end
+
+    def load(raw_value)
+      if @endianess == :big
+        self.value = check_raw_value(raw_value).pack('C*').unpack('g*') if !value.nil?
+      else
+        self.value = check_raw_value(raw_value).pack('C*').unpack('e*') if !value.nil?
+      end
+      after_load
+    end
+  end
+
+  class Float64 < BaseType
+    def initialize(options = {})
+      super options.merge :bit_length => 64, :sign => nil, :default_value => 0.0
+    end
+
+    def dump(value=nil)
+      before_dump( value )
+      if @endianess == :big
+        @raw_value = @value.pack('G*').unpack('C*')
+      else
+        @raw_value = @value.pack('E*').unpack('C*')
+      end
+    end
+
+    def load(raw_value)
+      if @endianess == :big
+        self.value = check_raw_value(raw_value).pack('C*').unpack('G*') if !value.nil?
+      else
+        self.value = check_raw_value(raw_value).pack('C*').unpack('E*') if !value.nil?
+      end
+      after_load
+    end
+  end
 end

data/lib/active_model_serializers_binary/railtie.rb

@@ -0,0 +1,4 @@
+module ActiveModelSerializersBinary
+  class Railtie < ::Rails::Railtie
+  end
+end

data/lib/active_model_serializers_binary/version.rb

@@ -1,3 +1,3 @@
 module ActiveModelSerializersBinary
-  VERSION = "0.2.0"
+  VERSION = "0.3.1"
 end

data/test/active_model_serializers_binary_test.rb

@@ -1,7 +1,7 @@
-require 'test_helper'
+require "test_helper"
 
 class ActiveModelSerializersBinaryTest < ActiveSupport::TestCase
-  test "truth" do
-    assert_kind_of Module, ActiveModelSerializersBinary
+  test "it has a version number" do
+    assert ActiveModelSerializersBinary::VERSION
   end
 end

data/test/dummy/Rakefile

@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require_relative "config/application"
 
 Rails.application.load_tasks

data/test/dummy/app/assets/stylesheets/application.css

@@ -1,15 +1 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any styles
- * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
- * file per style scope.
- *
- *= require_tree .
- *= require_self
- */
+/* Application styles */

data/test/dummy/app/channels/application_cable/channel.rb

@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Channel < ActionCable::Channel::Base
+  end
+end

data/test/dummy/app/channels/application_cable/connection.rb

@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Connection < ActionCable::Connection::Base
+  end
+end

data/test/dummy/app/controllers/application_controller.rb

@@ -1,5 +1,2 @@
 class ApplicationController < ActionController::Base
-  # Prevent CSRF attacks by raising an exception.
-  # For APIs, you may want to use :null_session instead.
-  protect_from_forgery with: :exception
 end

data/test/dummy/app/jobs/application_job.rb

@@ -0,0 +1,7 @@
+class ApplicationJob < ActiveJob::Base
+  # Automatically retry jobs that encountered a deadlock
+  # retry_on ActiveRecord::Deadlocked
+
+  # Most jobs are safe to ignore if the underlying records are no longer available
+  # discard_on ActiveJob::DeserializationError
+end

data/test/dummy/app/mailers/application_mailer.rb

@@ -0,0 +1,4 @@
+class ApplicationMailer < ActionMailer::Base
+  default from: "from@example.com"
+  layout "mailer"
+end

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

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  primary_abstract_class
+end

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

@@ -0,0 +1,28 @@
+class Product
+	include ActiveModel::Serializers::Binary
+	include ActiveModel::Model # This must not be included when serializing ActiveRecord classes
+
+	endianess :big
+	align :dword
+
+	int8 :int8
+	int16 :int16
+	int16le :int16le
+	int16be :int16be
+	int32 :int32
+	int32le :int32le
+	int32be :int32be
+	uint8 :uint8
+	uint16 :uint16
+	uint16le :uint16le
+	uint16be :uint16be
+	uint32 :uint32
+	uint32le :uint32le
+	uint32be :uint32be
+	bitfield :bitfield
+	float32 :float32
+	float64 :float64
+	char :char
+	bool :bool
+	#nest :type, coder: Type
+end

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

@@ -0,0 +1,6 @@
+class Silo < ApplicationRecord
+	include ActiveModel::Serializers::Binary
+
+	int16 :test
+	int32 :test1
+end

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

@@ -0,0 +1,7 @@
+class Type
+	include ActiveModel::Serializers::Binary
+
+	int16 :product_id
+	char :name, count: 1, length: 20
+
+end