goods 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 587e410504981ece079d24dbbc15a0408ca54985
-  data.tar.gz: d34b7f6dcbac3169e10ba29fb01bda914c5f0736
+  metadata.gz: 6ba028ffc9f2ea9eeec008971060a0b66c2c99ea
+  data.tar.gz: 1e80a10fd4e52f22c57789994592ce09c62added
 SHA512:
-  metadata.gz: b94d34341aaab7c7319c85dd0df6614e1c769acdc9490c27cc00a45e38c80cd237cbd3f0a269c1df1dc65f8cfcc4fbf190083bc4264d459d692771efd881aa57
-  data.tar.gz: 216ac093e960bf563e6262cd0973d5ae5152ff47846c6e7e6051a8aaa4eb0fad5e4668b78a6c872f62348a2c73e028b71199518e22da686dbcc4d2bbffa3fd1d
+  metadata.gz: ca29741ba878d8c0a29e43c256737d606ed011babe5f0a73102611c4c9bef3d94ca67276f757240a2649ba285d77bf7a5b012ccdaf2c0f62e480102e9bd2cf2b
+  data.tar.gz: cc1780dca99d100667402dd7b7ac541b545d853232b71af992cffb22ef8c51b8b64c027134e10abb49959091f698476ecc42f96d0ee62df51e19f3074e9bf6d9

data/lib/goods/category.rb

@@ -1,12 +1,10 @@
 module Goods
-  class Category
-    include Containable
+  class Category < Element
     attr_accessor :parent
-    attr_field :parent_id
-    attr_field :name
+    attr_field :parent_id, :name
 
     def initialize(info_hash)
-      self._info_hash = info_hash
+      super
       @parent_at_level = {}
     end
 

data/lib/goods/currency.rb

@@ -1,18 +1,6 @@
 module Goods
-  class Currency
-    include Containable
-
-    def initialize(info_hash)
-      self._info_hash = info_hash
-    end
-
-    def rate
-      @rate ||= _info_hash[:rate].to_f
-    end
-
-    def plus
-      @plus ||= _info_hash[:plus].to_f
-    end
+  class Currency < Element
+    attr_field :rate, :plus, type: :float
 
     def in(other_currency)
       self.rate/other_currency.rate

data/lib/goods/element.rb

@@ -0,0 +1,78 @@
+module Goods
+  class Element
+
+    def self.generate_accessor(field_name, type)
+      define_method field_name do
+        if field = instance_variable_get("@#{field_name}")
+          field
+        else
+          setup_instance_variable(field_name, type)
+          instance_variable_get("@#{field_name}")
+        end
+      end
+    end
+
+    # Class macro that defined mathods to access instance variables @some_field
+    # in the following way (illustrative example)
+    #
+    # attr_field :field_name
+    #
+    # is equivalent to
+    #
+    # def field_name
+    #   @field_name ||= description[:field_name]
+    # end
+    #
+    # This method can take several arguments with optional hash at the end.
+    # Semantics is the same as with attr_* family of methods.
+    #
+    # You can specify the type of field by providin {type: :some_type} hash as
+    # the last argument. For example type: :float will call #to_f on resulting
+    # value.
+    def self.attr_field(*args)
+      opts = args.last.is_a?(Hash) ? args.pop : {}
+      type = opts[:type] || :string
+
+      args.each do |field_name|
+        self.generate_accessor(field_name, type)
+      end
+    end
+
+    def initialize(info_hash)
+      @info_hash = info_hash
+    end
+
+    attr_field :id
+
+    def invalid_fields
+      @invalid_fields ||= []
+    end
+
+    def valid?
+      reset_validation
+      apply_validation_rules
+      invalid_fields.empty?
+    end
+
+    private
+
+    def reset_validation
+      invalid_fields.clear
+    end
+
+    def validate(field, predicate)
+       invalid_fields << field unless predicate.call(send(field))
+    end
+
+    def setup_instance_variable(name, type)
+      case type
+      when :string
+        instance_variable_set("@#{name}", @info_hash[name])
+      when :float
+        instance_variable_set("@#{name}", @info_hash[name].to_f)
+      else
+        raise ArgumentError, 'wrong type'
+      end
+    end
+  end
+end

data/lib/goods/offer.rb

@@ -1,21 +1,9 @@
 module Goods
-  class Offer
-    include Containable
+  class Offer < Element
     attr_accessor :category, :currency, :price
-    attr_field :category_id
-    attr_field :currency_id
-    attr_field :available
-    attr_field :description
-    attr_field :model
-    attr_field :name
-    attr_field :picture
-    attr_field :vendor
-    attr_field :url
-
-    def initialize(info_hash)
-      self._info_hash = info_hash
-      @price = _info_hash[:price].to_f
-    end
+    attr_field :category_id, :currency_id, :available, :description,
+               :model, :name, :picture, :vendor, :url
+    attr_field :price, type: :float
 
     def convert_currency(other_currency)
       self.price *= currency.in(other_currency)
@@ -28,6 +16,10 @@ module Goods
       @category_id = other_category.id
     end
 
+    def price=(price)
+      @price = price
+    end
+
     private
 
     def apply_validation_rules
@@ -40,5 +32,6 @@ module Goods
       }
       validate :price, proc { |price| price && price > 0 }
     end
+
   end
 end

data/lib/goods/version.rb

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

data/lib/goods/xml.rb

@@ -20,7 +20,7 @@ module Goods
       @offers ||= extract_offers
     end
 
-    def generation_date      
+    def generation_date
       @generation_date ||= extract_catalog_generation_date
     end
 

data/lib/goods.rb

@@ -2,7 +2,7 @@ require 'open-uri'
 require "goods/version"
 require "goods/xml/validator"
 require "goods/xml"
-require "goods/containable"
+require "goods/element"
 require "goods/container"
 require "goods/category"
 require "goods/categories_list"

data/spec/goods/category_spec.rb

@@ -4,7 +4,7 @@ describe Goods::Category do
   let(:valid_description) { {id: "1", name: "Name"} }
   let(:root) { Goods::Category.new valid_description }
 
-  it_should_behave_like "containable" do
+  it_should_behave_like "element" do
     let(:element) { Goods::Category.new(valid_description) }
   end
 

data/spec/goods/currency_spec.rb

@@ -4,7 +4,7 @@ describe Goods::Currency do
   let(:valid_description) { {id: "VAL_CUR", rate: 1, plus: 0} }
   let(:valid_currency) { Goods::Currency.new(valid_description) }
 
-  it_should_behave_like "containable" do
+  it_should_behave_like "element" do
     let(:element) { valid_currency }
   end
 

data/spec/goods/offer_spec.rb

@@ -13,7 +13,7 @@ describe Goods::Offer do
     offer
   end
 
-  it_should_behave_like "containable" do
+  it_should_behave_like "element" do
     let(:element) { valid_offer }
   end
 

data/spec/support/{shared_examples_for_containable.rb → shared_examples_for_element.rb}

@@ -1,4 +1,4 @@
-shared_examples "containable" do
+shared_examples "element" do
   [:id, :invalid_fields].each do |prop|
     it "should give access to #{prop}" do
       expect(element).to respond_to(prop)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goods
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Artem Pyanykh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,10 +101,10 @@ files:
 - lib/goods/catalog.rb
 - lib/goods/categories_list.rb
 - lib/goods/category.rb
-- lib/goods/containable.rb
 - lib/goods/container.rb
 - lib/goods/currencies_list.rb
 - lib/goods/currency.rb
+- lib/goods/element.rb
 - lib/goods/offer.rb
 - lib/goods/offers_list.rb
 - lib/goods/version.rb
@@ -124,8 +124,8 @@ files:
 - spec/goods/xml_spec.rb
 - spec/goods_spec.rb
 - spec/spec_helper.rb
-- spec/support/shared_examples_for_containable.rb
 - spec/support/shared_examples_for_container.rb
+- spec/support/shared_examples_for_element.rb
 homepage: https://github.com/ArtemPyanykh/goods
 licenses:
 - MIT
@@ -164,5 +164,5 @@ test_files:
 - spec/goods/xml_spec.rb
 - spec/goods_spec.rb
 - spec/spec_helper.rb
-- spec/support/shared_examples_for_containable.rb
 - spec/support/shared_examples_for_container.rb
+- spec/support/shared_examples_for_element.rb

data/lib/goods/containable.rb

@@ -1,56 +0,0 @@
-module Goods
-  module Containable
-    def self.included(base)
-      # Class macro that defined mathod to access instance variable @field_name
-      # in the following way (illustrative example)
-      #
-      # def field_name
-      #   @field_name ||= description[field_name]
-      # end
-      base.define_singleton_method :attr_field do |field_name|
-        define_method field_name do
-          if field = instance_variable_get("@#{field_name}")
-            field
-          else
-            instance_variable_set("@#{field_name}", _info_hash[field_name])
-            instance_variable_get("@#{field_name}")
-          end
-        end
-      end
-    end
-
-    def _info_hash
-      @_info_hash
-    end
-    private :_info_hash
-
-    def id
-      @id ||= _info_hash[:id]
-    end
-
-    def invalid_fields
-      @invalid_fields ||= []
-    end
-
-    def valid?
-      reset_validation
-      apply_validation_rules
-      invalid_fields.empty?
-    end
-
-    private
-
-    def reset_validation
-      invalid_fields.clear
-    end
-
-    def validate(field, predicate)
-       invalid_fields << field unless predicate.call(send(field))
-    end
-
-    def _info_hash=(info_hash)
-      @_info_hash = info_hash
-    end
-    private :_info_hash=
-  end
-end