kosher 0.14.2 → 0.15.0

data/README.md

@@ -2,4 +2,4 @@
 
 [![travis](http://travis-ci.org/hakanensari/kosher.png)](http://travis-ci.org/hakanensari/kosher)
 
-I filter stuff.
+I filter things.

data/kosher.gemspec

@@ -9,14 +9,14 @@ Gem::Specification.new do |s|
   s.authors     = ['Hakan Ensari']
   s.email       = 'code@papercavalier.com'
   s.homepage    = 'https://github.com/hakanensari/kosher'
-  s.summary     = %q{I filter stuff.}
-  s.description = %q{I filter stuff.}
+  s.summary     = %q{I filter things.}
+  s.description = %q{I filter things.}
 
   {
-    'activemodel'   => '~> 3.0',
+    'activemodel'   => '~> 3.1',
     'certainty'     => '~> 0.2',
     'money'         => '~> 3.7',
-    'structure'     => '~> 0.19'
+    'structure'     => '~> 0.20'
   }.each do |lib, version|
     s.add_runtime_dependency lib, version
   end

data/lib/kosher/condition.rb

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

data/lib/kosher/filter.rb

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

data/lib/kosher/offer.rb

@@ -1,24 +1,15 @@
-require 'kosher/filter'
-require 'kosher/price'
-
-require 'kosher/detail'
-require 'kosher/seller'
-require 'kosher/shipping'
-require 'kosher/unit'
-require 'kosher/venue'
-
 module Kosher
   class Offer < Structure
     include Comparable
 
-    key :id,       String
-    key :detail,   Detail
-    key :seller,   Seller
+    key :id, String
+    key :condition, Condition
+    key :seller, Seller
     key :shipping, Shipping
-    key :unit,     Unit
-    key :venue_id, Integer
+    key :unit, Unit
+    key :venue, String
 
-    validates_presence_of :detail, :seller, :shipping, :unit, :venue
+    validates_presence_of :condition, :seller, :shipping, :unit, :venue
 
     def <=>(other)
       if kosher? != other.kosher?
@@ -29,17 +20,12 @@ module Kosher
     end
 
     def kosher?
-      raise_error_if_invalid
-
-      [seller, shipping, detail].all?(&:kosher?)
+      validate!
+      [seller, shipping, condition].all?(&:kosher?)
     end
 
     def price
       unit.price + shipping.price
     end
-
-    def venue
-      Venue.find(venue_id)
-    end
   end
 end

data/lib/kosher/price.rb

@@ -1,7 +1,7 @@
 module Kosher
   module Price
     def self.included(base)
-      base.key :cents,    Integer
+      base.key :cents, Integer
       base.key :currency, String
 
       base.validates_presence_of     :currency
@@ -9,7 +9,7 @@ module Kosher
     end
 
     def price
-      raise_error_if_invalid
+      validate!
 
       Money.new(cents, currency)
     end

data/lib/kosher/seller.rb

@@ -2,8 +2,8 @@ module Kosher
   class Seller < Structure
     include Filter
 
-    key :id,     String
-    key :name,   String
+    key :id, String
+    key :name, String
     key :rating, Float
 
     validates_presence_of :name

data/lib/kosher/shipping.rb

@@ -7,6 +7,9 @@ module Kosher
 
     validates_presence_of :available
 
-    alias available? available
+    def available?
+      validate!
+      available
+    end
   end
 end

data/lib/kosher/unit.rb

@@ -2,6 +2,6 @@ module Kosher
   class Unit < Structure
     include Price
 
-    key :quantity, Integer, :default => 1
+    key :quantity, Integer, 1
   end
 end

data/lib/kosher/version.rb

@@ -1,3 +1,3 @@
 module Kosher
-  VERSION = '0.14.2'
+  VERSION = '0.15.0'
 end

data/lib/kosher.rb

@@ -6,14 +6,13 @@ require 'structure'
 class Structure
   class InvalidRecord < StandardError
     def initialize(record)
-      msg = record.errors.full_messages.join(', ')
-      super msg
+      super record.errors.full_messages.join(', ')
     end
   end
 
   include ActiveModel::Conversion
   include ActiveModel::Validations
-  extend  ActiveModel::Naming
+  extend ActiveModel::Naming
 
   def persisted?
     false
@@ -21,9 +20,17 @@ class Structure
 
   private
 
-  def raise_error_if_invalid
+  def validate!
     raise InvalidRecord.new(self) if invalid?
   end
 end
 
-require 'kosher/offer'
+module Kosher
+  autoload :Condition, 'kosher/condition'
+  autoload :Filter,    'kosher/filter'
+  autoload :Offer,     'kosher/offer'
+  autoload :Price,     'kosher/price'
+  autoload :Seller,    'kosher/seller'
+  autoload :Shipping,  'kosher/shipping'
+  autoload :Unit,      'kosher/unit'
+end

data/test/kosher_test.rb

@@ -11,33 +11,24 @@ end
 include Kosher
 
 class TestKosher < MiniTest::Unit::TestCase
-  def test_prices
-    unit = Unit.new(:cents    => '1000',
-                    :currency => 'EUR')
-    assert_equal '10,00 €', unit.price.format
-
+  def test_money
+    unit     = Unit.new(    :cents    => '1000',
+                            :currency => 'EUR')
     shipping = Shipping.new(:available => true,
                             :cents     => '300',
                             :currency  => 'EUR')
-    assert_equal '3,00 €', shipping.price.format
+    offer    = Offer.new(   :shipping => shipping,
+                            :unit     => unit)
 
-    offer = Offer.new(:shipping => shipping,
-                      :unit     => unit)
+    assert_equal '10,00 €', unit.price.format
+    assert_equal '3,00 €',  shipping.price.format
     assert_equal '13,00 €', offer.price.format
   end
 
-  def test_venues
-    assert_equal 'Amazon.com',   Venue.find(1).name
-    assert_equal 'Amazon.co.uk', Venue.find(2).name
-
-    offer = Offer.new(:venue_id => 1)
-    assert_equal Venue.find(1), offer.venue
-  end
-
   def test_validation
-    assert_raises(Structure::InvalidRecord) { Detail.new.kosher? }
-    detail = Detail.new(:condition => 1)
-    assert detail.kosher?
+    assert_raises(Structure::InvalidRecord) { Condition.new.kosher? }
+    condition = Condition.new(:grade => 1)
+    assert condition.kosher?
 
     assert_raises(Structure::InvalidRecord) { Shipping.new.kosher? }
     shipping = Shipping.new(:available => true,
@@ -50,18 +41,11 @@ class TestKosher < MiniTest::Unit::TestCase
     assert seller.kosher?
 
     assert_raises(Structure::InvalidRecord) { Offer.new.kosher? }
-    offer = Offer.new(:detail   => detail,
-                      :shipping => shipping,
-                      :seller   => seller,
-                      :unit     => Unit.new,
-                      :venue_id => 1)
+    offer = Offer.new(:condition => condition,
+                      :shipping  => shipping,
+                      :seller    => seller,
+                      :unit      => Unit.new,
+                      :venue     => 'Amazon.com')
     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)
-    assert_equal 8, Venue.amazon.size
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kosher
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.15.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-01 00:00:00.000000000Z
+date: 2011-09-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70237892025340 !ruby/object:Gem::Requirement
+  requirement: &70296149797340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70237892025340
+  version_requirements: *70296149797340
 - !ruby/object:Gem::Dependency
   name: certainty
-  requirement: &70237892024860 !ruby/object:Gem::Requirement
+  requirement: &70296149796480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70237892024860
+  version_requirements: *70296149796480
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &70237892024420 !ruby/object:Gem::Requirement
+  requirement: &70296149795640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,19 +43,19 @@ dependencies:
         version: '3.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70237892024420
+  version_requirements: *70296149795640
 - !ruby/object:Gem::Dependency
   name: structure
-  requirement: &70237892023980 !ruby/object:Gem::Requirement
+  requirement: &70296149794680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.20'
   type: :runtime
   prerelease: false
-  version_requirements: *70237892023980
-description: I filter stuff.
+  version_requirements: *70296149794680
+description: I filter things.
 email: code@papercavalier.com
 executables: []
 extensions: []
@@ -67,17 +67,15 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- data/venues.yml
 - kosher.gemspec
 - lib/kosher.rb
-- lib/kosher/detail.rb
+- lib/kosher/condition.rb
 - lib/kosher/filter.rb
 - lib/kosher/offer.rb
 - lib/kosher/price.rb
 - lib/kosher/seller.rb
 - lib/kosher/shipping.rb
 - lib/kosher/unit.rb
-- lib/kosher/venue.rb
 - lib/kosher/version.rb
 - test/kosher_test.rb
 homepage: https://github.com/hakanensari/kosher
@@ -94,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4442667444567861971
+      hash: -3818355639004243263
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -103,12 +101,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4442667444567861971
+      hash: -3818355639004243263
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: I filter stuff.
+summary: I filter things.
 test_files:
 - test/kosher_test.rb

data/data/venues.yml

@@ -1,28 +0,0 @@
----
-- id:      1
-  name:    Amazon.com
-  country: us
-- id:      2
-  name:    Amazon.co.uk
-  country: uk
-- id:      3
-  name:    Amazon.de
-  country: de
-- id:      4
-  name:    Amazon.ca
-  country: ca
-- id:      5
-  name:    Amazon.fr
-  country: fr
-- id:      6
-  name:    Amazon.co.jp
-  country: jp
-- id:      7
-  name:    Amazon.co.jp
-  country: jp
-- id:      8
-  name:    Amazon.cn
-  country: cn
-- id:      9
-  name:    Barnesandnoble.com
-  country: us

data/lib/kosher/detail.rb

@@ -1,18 +0,0 @@
-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/venue.rb

@@ -1,34 +0,0 @@
-require 'yaml'
-
-module Kosher
-  class Venue < Structure
-    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
-
-      def each(&block)
-        all.each { |item| block.call(item) }
-      end
-
-      def find(id)
-        super() { |item| item._id == id }
-      end
-    end
-  end
-end