kosher 0.11.1 → 0.13.0

data/kosher.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
     'activemodel'   => '~> 3.0',
     'certainty'     => '~> 0.2',
     'money'         => '~> 3.7',
-    'structure'     => '~> 0.18'
+    'structure'     => '~> 0.19'
   }.each do |lib, version|
     s.add_runtime_dependency lib, version
   end

data/lib/kosher/detail.rb

@@ -0,0 +1,18 @@
+module Kosher
+  class Detail < Structure
+    include Filter
+
+    key :condition,   Integer
+    key :description, String, :default => ''
+
+    validates_inclusion_of :condition, :in => 1..6
+
+    def new?
+      condition == 1
+    end
+
+    def used?
+      !new?
+    end
+  end
+end

data/lib/kosher/filter.rb

@@ -0,0 +1,12 @@
+module Kosher
+  module Filter
+    def self.included(base)
+      base.key :kosher, Boolean, :default => true
+    end
+
+    def kosher?
+      validate!
+      kosher
+    end
+  end
+end

data/lib/kosher/offer.rb

@@ -1,6 +1,9 @@
-require 'kosher/base'
+require 'certainty'
+
+require 'kosher/filter'
 require 'kosher/price'
 
+require 'kosher/detail'
 require 'kosher/seller'
 require 'kosher/shipping'
 require 'kosher/unit'
@@ -10,12 +13,15 @@ module Kosher
   class Offer < Structure
     include Comparable
 
-    key :id
-    key :seller
-    key :shipping
-    key :unit
+    key :id,       String
+    key :detail,   Detail
+    key :seller,   Seller
+    key :shipping, Shipping
+    key :unit,     Unit
     key :venue_id, Integer
 
+    validates_presence_of :detail, :seller, :shipping, :unit, :venue
+
     def <=>(other)
       if kosher? != other.kosher?
         kosher? ? -1 : 1
@@ -25,7 +31,8 @@ module Kosher
     end
 
     def kosher?
-      [seller, shipping, unit].all?(&:kosher?)
+      validate!
+      [seller, shipping, detail].all?(&:kosher?)
     end
 
     def price

data/lib/kosher/price.rb

@@ -1,3 +1,5 @@
+require 'money'
+
 module Kosher
   module Price
     def self.included(base)
@@ -9,6 +11,7 @@ module Kosher
     end
 
     def price
+      validate!
       Money.new(cents, currency)
     end
   end

data/lib/kosher/seller.rb

@@ -1,7 +1,9 @@
 module Kosher
-  class Seller < Base
-    key :id
-    key :name
+  class Seller < Structure
+    include Filter
+
+    key :id,     String
+    key :name,   String
     key :rating, Float
 
     validates_presence_of :name

data/lib/kosher/shipping.rb

@@ -1,5 +1,6 @@
 module Kosher
-  class Shipping < Base
+  class Shipping < Structure
+    include Filter
     include Price
 
     key :available, Boolean

data/lib/kosher/unit.rb

@@ -1,19 +1,7 @@
 module Kosher
-  class Unit < Base
+  class Unit < Structure
     include Price
 
-    key :condition,   Integer
-    key :description, String
-    key :quantity,    Integer, :default => 1
-
-    validates_inclusion_of :condition, :in => 1..6
-
-    def new?
-      condition == 1
-    end
-
-    def used?
-      !new?
-    end
+    key :quantity, Integer, :default => 1
   end
 end

data/lib/kosher/venue.rb

@@ -1,12 +1,34 @@
+require 'yaml'
+
 module Kosher
   class Venue < Structure
-    key :country
-    key :name
+    DATA_PATH = File.expand_path("../../../data/venues.yml", __FILE__)
+
+    key :_id,     Integer
+    key :country, String
+    key :name,    String
+
+    class << self
+      include Enumerable
+
+      def all
+        @all ||= YAML.load_file(DATA_PATH).map do |hsh|
+          hsh['_id'] ||= hsh.delete('id')
+          new(hsh)
+        end
+      end
+
+      def amazon
+        @amazons ||= find_all { |e| e.name.include? 'Amazon' }
+      end
 
-    set_data_file File.expand_path("../../../data/venues.yml", __FILE__)
+      def each(&block)
+        all.each { |item| block.call(item) }
+      end
 
-    def self.amazon
-      @amazons ||= find_all { |e| e.name.include? 'Amazon' }
+      def find(id)
+        super() { |item| item._id == id }
+      end
     end
   end
 end

data/lib/kosher/version.rb

@@ -1,3 +1,3 @@
 module Kosher
-  VERSION = '0.11.1'
+  VERSION = '0.13.0'
 end

data/lib/kosher.rb

@@ -1,6 +1,22 @@
 require 'active_model'
-require 'certainty'
-require 'money'
 require 'structure'
 
+module Kosher
+  class NotValid < StandardError
+    def initialize(record)
+      super(record.errors.full_messages.join(', '))
+    end
+  end
+end
+
+class Structure
+  include ActiveModel::Validations
+
+  private
+
+  def validate!
+    raise NotValid.new(self) unless valid?
+  end
+end
+
 require 'kosher/offer'

data/test/kosher_test.rb

@@ -16,8 +16,9 @@ class TestKosher < MiniTest::Unit::TestCase
                     :currency => 'EUR')
     assert_equal '10,00 €', unit.price.format
 
-    shipping = Shipping.new(:cents    => '300',
-                            :currency => 'EUR')
+    shipping = Shipping.new(:available => true,
+                            :cents     => '300',
+                            :currency  => 'EUR')
     assert_equal '3,00 €', shipping.price.format
 
     offer = Offer.new(:shipping => shipping,
@@ -34,30 +35,35 @@ class TestKosher < MiniTest::Unit::TestCase
   end
 
   def test_validation
-    assert_raises(StandardError) { Unit.new.kosher? }
-    unit = Unit.new(:condition => 1,
-                    :cents     => 100,
-                    :currency  => 'USD')
-    assert unit.kosher?
+    assert_raises(NotValid) { Detail.new.kosher? }
+    detail = Detail.new(:condition => 1)
+    assert detail.kosher?
 
-    assert_raises(StandardError) { Shipping.new.kosher? }
+    assert_raises(NotValid) { Shipping.new.kosher? }
     shipping = Shipping.new(:available => true,
                             :cents     => 100,
                             :currency  => 'USD')
     assert shipping.kosher?
 
-    assert_raises(StandardError) { Seller.new.kosher? }
+    assert_raises(NotValid) { Seller.new.kosher? }
     seller = Seller.new(:name => 'John Doe')
     assert seller.kosher?
 
-    assert_raises(NoMethodError) { Offer.new.kosher? }
-    offer = Offer.new(:unit     => unit,
+    assert_raises(NotValid) { Offer.new.kosher? }
+    offer = Offer.new(:detail   => detail,
                       :shipping => shipping,
                       :seller   => seller,
+                      :unit     => Unit.new,
                       :venue_id => 1)
     assert offer.kosher?
   end
 
+  def test_venues
+    assert_kind_of Venue, Venue.first
+    assert 'Amazon.com', Venue.find(1).name
+    assert_nil Venue.find(0)
+  end
+
   def test_amazon_venues
     assert_equal 8, Venue.amazon.size
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kosher
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-26 00:00:00.000000000Z
+date: 2011-08-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70333604988360 !ruby/object:Gem::Requirement
+  requirement: &70322729328200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70333604988360
+  version_requirements: *70322729328200
 - !ruby/object:Gem::Dependency
   name: certainty
-  requirement: &70333604987700 !ruby/object:Gem::Requirement
+  requirement: &70322729327560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70333604987700
+  version_requirements: *70322729327560
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &70333604987180 !ruby/object:Gem::Requirement
+  requirement: &70322729326860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,18 +43,18 @@ dependencies:
         version: '3.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70333604987180
+  version_requirements: *70322729326860
 - !ruby/object:Gem::Dependency
   name: structure
-  requirement: &70333604986660 !ruby/object:Gem::Requirement
+  requirement: &70322729326360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.19'
   type: :runtime
   prerelease: false
-  version_requirements: *70333604986660
+  version_requirements: *70322729326360
 description: Online selling, abstracted
 email: code@papercavalier.com
 executables: []
@@ -70,7 +70,8 @@ files:
 - data/venues.yml
 - kosher.gemspec
 - lib/kosher.rb
-- lib/kosher/base.rb
+- lib/kosher/detail.rb
+- lib/kosher/filter.rb
 - lib/kosher/offer.rb
 - lib/kosher/price.rb
 - lib/kosher/seller.rb
@@ -93,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3190499119552710730
+      hash: -2784991868490813803
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -102,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3190499119552710730
+      hash: -2784991868490813803
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.6

data/lib/kosher/base.rb

@@ -1,18 +0,0 @@
-module Kosher
-  class Base < Structure
-    include ActiveModel::Validations
-
-    def self.inherited(child)
-      child.key :foo
-      child.key :kosher, Boolean, :default => true
-    end
-
-    def kosher?
-      unless valid?
-        raise StandardError.new(errors.full_messages.join(', '))
-      end
-
-      kosher
-    end
-  end
-end