general_units 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee405e53d489845a7239d7301ff0d582caac6565
-  data.tar.gz: 38c046bb71f0908432f04d0be231c3c2214793a4
+  metadata.gz: ba43bb6e8b19eba9b18fccc0c5d40fdebbc26c31
+  data.tar.gz: dee3ce3ab9873f719d6e4fc09707ef3a89d99562
 SHA512:
-  metadata.gz: 36399caf5fef89a3d11771717d96d91031e986b5fc729f0443b34635fd17dd358990cb9d5bf7877ec38e3fad50976c8c934426c0634a34c586397e34909c58f7
-  data.tar.gz: bee9e5c75aa9f697e56f488d64a1173c58a9f2dff345ee0a8c1f2e7fb9cc537fac1df4fafa30ca054ba8239525380bfb5370745aaa7b3cee0754d5ad7774afc8
+  metadata.gz: 6229d7a83ac3f0f58fc7177d3461323849ae609e4178121c1cadd9df72a86511e81c22a8d41cb85b0725cc5559cc311d81e66935776c0d4773e781b9c08c6e26
+  data.tar.gz: c8d68aec598958c1633f5b64b56124050c889d72ad80deaed48453e2c6dd21300907ba512bd0eabfa58862a0843a8ceb2d0349185feecdc757ffdc28e96eb842

data/lib/general_units/derivatives/box.rb

@@ -8,11 +8,18 @@ module GeneralUnits
   
     attr_reader *VALUES, :unit
   
+    delegate :to_f, :to => :amount
+    delegate :hash, :to => :attributes
+  
     def initialize(length = 0, width = 0, height = 0, unit)
       VALUES.each {|v| instance_variable_set(:"@#{v}", validate_value(eval(v), unit))}
       @unit = @height.unit
     end
   
+    def attributes
+      {:length => length, :width => width, :height => height, :unit => unit}
+    end
+  
     def values
       VALUES.map {|v| self.send(v)}
     end
@@ -25,8 +32,12 @@ module GeneralUnits
       Box.new(*values.map {|v| v.convert_to(unit).amount}, unit)
     end
 
-    def to_s(round = 2)
-      "#{values.map(&:to_f).map {|f| f.round(round)}.join("x")} #{unit.short}"
+    def to_s(round = nil)
+      values.map {|d| d.to_s(round)}.join("x")
+    end
+    
+    def formatted(round = nil)
+      "#{to_s(round)} #{unit.short}"
     end
     
     def accommodates?(*boxes)
@@ -59,7 +70,7 @@ module GeneralUnits
       self == other_object
     end
 
-    def <=>(val)
+    def <=>(other_object)
       other_object = validate_capacity_or_length(other_object)
       amount <=> case other_object
       when Length then other_object

data/lib/general_units/helpers/action_view_extension.rb

@@ -6,6 +6,14 @@ module GeneralUnits
     included do
     end
     
+    def weight_units_for_select
+      Weight::UNITS.map {|u| [u.name, u.code]}
+    end
+    
+    def length_units_for_select
+      Length::UNITS.map {|u| [u.name, u.code]}
+    end
+    
   end
   
 end

data/lib/general_units/models/active_record_extension.rb

@@ -4,6 +4,200 @@ module GeneralUnits
     extend ActiveSupport::Concern
   
     module ClassMethods
+      
+      def has_weight(*args)
+        options = args.extract_options!
+        prefix = args.first||:weight
+        
+        class_attribute :_has_weight unless defined?(_has_weight)
+        self._has_weight = {prefix => {}}
+        
+        self._has_weight[prefix][:amount_field] = amount_field = options[:amount]||:"#{prefix}_amount"
+        self._has_weight[prefix][:unit_field] = unit_field = options[:unit]||:"#{prefix}_unit"
+        self._has_weight[prefix][:default_unit] = default_unit = options[:default_unit]||:kilogram
+        self._has_weight[prefix][:default_unit_method] = default_unit_method = options[:default_unit_method]||:"deafult_#{prefix}_unit"
+        
+  			validates_inclusion_of unit_field, :in => Weight::UNITS.map {|u| u.code.to_s}, :if => Proc.new {|o| o.send(amount_field).present?}
+        
+        class_eval <<-EOV
+        
+          def #{unit_field}=(value)
+            if value.to_sym.in?(GeneralUnits::Weight::UNITS.map(&:code))
+              super(value.to_s) 
+            else
+              raise ArgumentError, "Unprocessable unit: \#{value.inspect\}"
+            end
+          end
+        
+          def #{prefix}
+            begin
+              if @_#{prefix}.nil? || #{amount_field}_changed? || #{unit_field}_changed?
+                @_#{prefix} = GeneralUnits::Weight.new(#{amount_field}, #{unit_field})
+              else
+                @_#{prefix}
+              end
+            rescue ArgumentError, TypeError
+              nil
+            end
+          end
+          
+          def #{prefix}=(value)
+            case value
+            when GeneralUnits::Weight
+              self.#{amount_field} = value.amount
+              self.#{unit_field} = value.unit.code
+            when Array then
+              self.#{amount_field} = value[0]
+              self.#{unit_field} = value[1]||try(:#{default_unit_method})||:#{default_unit}
+            when Hash then
+              value = value.with_indifferent_access
+              self.#{amount_field} = value[:amount]
+              self.#{unit_field} = value[:unit]||try(:#{default_unit_method})||:#{default_unit}
+            when Numeric then
+              self.#{amount_field} = value
+              self.#{unit_field} = try(:#{default_unit_method})||:#{default_unit}
+            when nil then
+              self.#{amount_field} = nil
+              self.#{unit_field} = nil
+            end
+            #{prefix}
+          end
+        EOV
+      end
+      
+      def has_length(*args)
+        options = args.extract_options!
+        prefix = args.first||:length
+        
+        class_attribute :_has_length unless defined?(_has_length)
+        self._has_length = {prefix => {}}
+        
+        self._has_length[prefix][:amount_field] = amount_field = options[:amount]||:"#{prefix}_amount"
+        self._has_length[prefix][:unit_field] = unit_field = options[:unit]||:"#{prefix}_unit"
+        self._has_length[prefix][:default_unit] = default_unit = options[:default_unit]||:centimeter
+        self._has_length[prefix][:default_unit_method] = default_unit_method = options[:default_unit_method]||:"deafult_#{prefix}_unit"
+        
+  			validates_inclusion_of unit_field, :in => Length::UNITS.map {|u| u.code.to_s}, :if => Proc.new {|o| o.send(amount_field).present?}
+        
+        class_eval <<-EOV
+        
+          def #{unit_field}=(value)
+            if value.to_sym.in?(GeneralUnits::Length::UNITS.map(&:code))
+              super(value.to_s) 
+            else
+              raise ArgumentError, "Unprocessable unit: \#{value.inspect\}"
+            end
+          end
+        
+          def #{prefix}
+            begin
+              if @_#{prefix}.nil? || #{amount_field}_changed? || #{unit_field}_changed?
+                @_#{prefix} = GeneralUnits::Length.new(#{amount_field}, #{unit_field})
+              else
+                @_#{prefix}
+              end
+            rescue ArgumentError, TypeError
+              nil
+            end
+          end
+          
+          def #{prefix}=(value)
+            case value
+            when GeneralUnits::Length
+              self.#{amount_field} = value.amount
+              self.#{unit_field} = value.unit.code
+            when Array then
+              self.#{amount_field} = value[0]
+              self.#{unit_field} = value[1]||try(:#{default_unit_method})||:#{default_unit}
+            when Hash then
+              value = value.with_indifferent_access
+              self.#{amount_field} = value[:amount]
+              self.#{unit_field} = value[:unit]||try(:#{default_unit_method})||:#{default_unit}
+            when Numeric then
+              self.#{amount_field} = value
+              self.#{unit_field} = try(:#{default_unit_method})||:#{default_unit}
+            when nil then
+              self.#{amount_field} = nil
+              self.#{unit_field} = nil
+            end
+            #{prefix}
+          end
+        EOV
+      end
+      
+      def has_box(*args)
+        options = args.extract_options!
+        prefix = args.first||:box
+        
+        class_attribute :_has_box unless defined?(_has_box)
+        self._has_box = {prefix => {}}
+        
+        self._has_box[prefix][:length_field] = length_field = options[:length]||:"#{prefix}_length"
+        self._has_box[prefix][:width_field] = width_field = options[:width]||:"#{prefix}_width"
+        self._has_box[prefix][:height_field] = height_field = options[:height]||:"#{prefix}_height"
+        
+        self._has_box[prefix][:unit_field] = unit_field = options[:unit]||:"#{prefix}_unit"
+        self._has_box[prefix][:default_unit] = default_unit = options[:default_unit]||:centimeter
+        self._has_box[prefix][:default_unit_method] = default_unit_method = options[:default_unit_method]||:"deafult_#{prefix}_unit"
+        
+  			validates_inclusion_of unit_field, :in => Length::UNITS.map {|u| u.code.to_s}, :if => Proc.new {|o| o.send(length_field).present? || o.send(width_field).present? || o.send(height_field).present?}
+        
+        class_eval <<-EOV
+        
+          def #{unit_field}=(value)
+            if value.to_sym.in?(GeneralUnits::Length::UNITS.map(&:code))
+              super(value.to_s) 
+            else
+              raise ArgumentError, "Unprocessable unit: \#{value.inspect\}"
+            end
+          end
+          
+          def #{prefix}
+            begin
+              if @_#{prefix}.nil? || #{length_field}_changed? || #{width_field}_changed? || #{height_field}_changed? || #{unit_field}_changed?
+                @_#{prefix} = GeneralUnits::Box.new(#{length_field}, #{width_field}, #{height_field}, #{unit_field})
+              else
+                @_#{prefix}
+              end
+            rescue ArgumentError, TypeError
+              nil
+            end
+          end
+          
+          def #{prefix}=(value)
+            case value
+            when GeneralUnits::Box then
+              self.#{length_field} = value.length
+              self.#{width_field} = value.width
+              self.#{height_field} = value.height
+              self.#{unit_field} = value.unit.code
+            when Array then
+              self.#{length_field} = value[0]
+              self.#{width_field} = value[1]
+              self.#{height_field} = value[2]
+              self.#{unit_field} = value[3]||try(:#{default_unit_method})||:#{default_unit}
+            when Hash then
+              value = value.with_indifferent_access
+              self.#{length_field} = value[:length]
+              self.#{width_field} = value[:width]
+              self.#{height_field} = value[:height]
+              self.#{unit_field} = value[:unit]||try(:#{default_unit_method})||:#{default_unit}
+            when Numeric then
+              self.#{length_field} = value
+              self.#{width_field} = value
+              self.#{height_field} = value
+              self.#{unit_field} = try(:#{default_unit_method})||:#{default_unit}
+            when nil then
+              self.#{length_field} = nil
+              self.#{width_field} = nil
+              self.#{height_field} = nil
+              self.#{unit_field} = nil
+            end
+            #{prefix}
+          end
+        EOV
+      end
+      
     end
     
   end

data/lib/general_units/units/length.rb

@@ -5,9 +5,10 @@ module GeneralUnits
     ::GeneralUnits::Arithmetics.extend_class(self)
     
     class Unit
-      attr_reader :name, :short, :millimeters
+      attr_reader :code, :name, :short, :millimeters
   
-      def initialize(name, short, millimeters)
+      def initialize(code, name, short, millimeters)
+        @code = code
         @name = name.to_s
         @short = short.to_s
         @millimeters = millimeters.to_d
@@ -18,22 +19,23 @@ module GeneralUnits
       end
   
       def inspect
-        "\"#{name}\""
+        code
       end
     end
 
-    UNITS = {:mile_nautical => Unit.new("Mile (nautical)", "mln.", 1852000.0),
-             :mile => Unit.new("Mile", "ml.", 1609344.0),
-             :yard => Unit.new("Yard", "yrd.", 914.4),
-             :foot => Unit.new("Foot", "ft.", 304.8),
-             :inch => Unit.new("Inch", "in.", 25.4),
-             :kilometer => Unit.new("Kilometer", "km.", 1000000.0),
-             :meter => Unit.new("Meter", "m.", 1000.0),
-             :centimeter => Unit.new("Centimeter", "cm.", 10.0),
-             :millimeter => Unit.new("Millimeter", "mm.", 1.0)}
+    UNITS = [Unit.new(:mile_nautical, "Mile (nautical)", "mln.", 1852000.0),
+             Unit.new(:mile, "Mile", "ml.", 1609344.0),
+             Unit.new(:yard, "Yard", "yrd.", 914.4),
+             Unit.new(:foot, "Foot", "ft.", 304.8),
+             Unit.new(:inch, "Inch", "in.", 25.4),
+             Unit.new(:kilometer, "Kilometer", "km.", 1000000.0),
+             Unit.new(:meter, "Meter", "m.", 1000.0),
+             Unit.new(:centimeter, "Centimeter", "cm.", 10.0),
+             Unit.new(:millimeter, "Millimeter", "mm.", 1.0)]
 
     attr_reader :amount, :unit
     delegate :to_f, :to => :amount
+    delegate :hash, :to => :attributes
     
     def initialize(amount = 0, unit)
       if unit = valid_unit?(unit)
@@ -41,6 +43,10 @@ module GeneralUnits
         @unit = unit
       end
     end
+    
+    def attributes
+      {:amount => amount, :unit => unit}
+    end
 
     def convert_to(unit)
       if convert_unit = valid_unit?(unit)
@@ -49,8 +55,12 @@ module GeneralUnits
       end
     end
 
-    def to_s(round = 2)
-      "#{to_f.round(round)} #{unit.short}"
+    def to_s(round = nil)
+      "#{to_f.round(round||2)}"
+    end
+    
+    def formatted(round = nil)
+      "#{to_s(round)} #{unit.short}"
     end
 
     def to_length
@@ -61,10 +71,8 @@ module GeneralUnits
 
     def valid_unit?(unit)
       unit_object = case unit
-      when String then UNITS[unit.to_sym]
-      when Symbol then UNITS[unit]
+      when String, Symbol then UNITS.find {|u| u.code.to_s == unit.to_s}
       when Unit then unit
-      else UNITS[unit.to_s.to_sym]
       end
       unit_object || raise(TypeError, "Unprocessable unit #{unit.inspect}")
     end

data/lib/general_units/units/weight.rb

@@ -5,9 +5,10 @@ module GeneralUnits
     ::GeneralUnits::Arithmetics.extend_class(self)
     
     class Unit
-      attr_reader :name, :short, :grams
+      attr_reader :code, :name, :short, :grams
   
-      def initialize(name, short, grams)
+      def initialize(code, name, short, grams)
+        @code = code
         @name = name.to_s
         @short = short.to_s
         @grams = grams.to_d
@@ -18,21 +19,22 @@ module GeneralUnits
       end
   
       def inspect
-        "\"#{name}\""
+        code
       end
     end
 
-    UNITS = {:short_ton_us => Unit.new("Short ton (US)", "Sht.", 907184.74),
-             :pound_us => Unit.new("Pound (US)", "Pnd.", 453.59237),
-             :ounce_us => Unit.new("Ounce (US)", "Ounce", 28.349523),
-             :stone => Unit.new("Stone", "Stn", 6350.2932),
-             :long_ton_uk => Unit.new("Long Ton (UK)", "Lngt.", 1016046.9),
-             :metric_ton => Unit.new("Metric Ton", "Ton", 1000000.0),
-             :kilogram => Unit.new("Kilogram", "Kg.", 1000.0),
-             :gram => Unit.new("Gram", "g.", 1.0)}
+    UNITS = [Unit.new(:short_ton_us, "Short ton (US)", "Sht.", 907184.74),
+             Unit.new(:pound_us, "Pound (US)", "Pnd.", 453.59237),
+             Unit.new(:ounce_us, "Ounce (US)", "Ounce", 28.349523),
+             Unit.new(:stone, "Stone", "Stn", 6350.2932),
+             Unit.new(:long_ton_uk, "Long Ton (UK)", "Lngt.", 1016046.9),
+             Unit.new(:metric_ton, "Metric Ton", "Ton", 1000000.0),
+             Unit.new(:kilogram, "Kilogram", "Kg.", 1000.0),
+             Unit.new(:gram, "Gram", "g.", 1.0)]
 
     attr_reader :amount, :unit
     delegate :to_f, :to => :amount
+    delegate :hash, :to => :attributes
 
     def initialize(amount = 0, unit)
       if unit = valid_unit?(unit)
@@ -40,6 +42,10 @@ module GeneralUnits
         @unit = unit
       end
     end
+    
+    def attributes
+      {:amount => amount, :unit => unit}
+    end
 
     def convert_to(unit)
       if convert_unit = valid_unit?(unit)
@@ -48,8 +54,12 @@ module GeneralUnits
       end
     end
 
-    def to_s(round = 2)
-      "#{to_f.round(round)} #{unit.short}"
+    def to_s(round = nil)
+      "#{to_f.round(round||2)}"
+    end
+    
+    def formatted(round = nil)
+      "#{to_s(round)} #{unit.short}"
     end
 
     def to_weight
@@ -60,10 +70,8 @@ module GeneralUnits
 
     def valid_unit?(unit)
       unit_object = case unit
-      when String then UNITS[unit.to_sym]
-      when Symbol then UNITS[unit]
+      when String, Symbol then UNITS.find {|u| u.code.to_s == unit.to_s}
       when Unit then unit
-      else UNITS[unit.to_s.to_sym]
       end
       unit_object || raise(TypeError, "Unprocessable unit #{unit.inspect}")
     end

data/lib/general_units/version.rb

@@ -1,3 +1,3 @@
 module GeneralUnits
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: general_units
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Valery Kvon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n