kosher 0.15.0 → 0.16.0

data/Gemfile

@@ -1,4 +1,3 @@
 source 'http://rubygems.org'
 gemspec
-gem 'rake'
 gem 'pry' unless ENV['CI']

data/kosher.gemspec

@@ -9,14 +9,12 @@ 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 things.}
-  s.description = %q{I filter things.}
+  s.summary     = %q{A filter}
 
   {
-    'activemodel'   => '~> 3.1',
     'certainty'     => '~> 0.2',
     'money'         => '~> 3.7',
-    'structure'     => '~> 0.20'
+    'structure'     => '~> 0.22'
   }.each do |lib, version|
     s.add_runtime_dependency lib, version
   end

data/lib/kosher.rb

@@ -1,28 +1,8 @@
-require 'active_model'
 require 'certainty'
 require 'money'
 require 'structure'
 
 class Structure
-  class InvalidRecord < StandardError
-    def initialize(record)
-      super record.errors.full_messages.join(', ')
-    end
-  end
-
-  include ActiveModel::Conversion
-  include ActiveModel::Validations
-  extend ActiveModel::Naming
-
-  def persisted?
-    false
-  end
-
-  private
-
-  def validate!
-    raise InvalidRecord.new(self) if invalid?
-  end
 end
 
 module Kosher

data/lib/kosher/offer.rb

@@ -2,14 +2,14 @@ module Kosher
   class Offer < Structure
     include Comparable
 
-    key :id, String
-    key :condition, Condition
-    key :seller, Seller
+    key :kosher, Boolean
+    key :new, Boolean
     key :shipping, Shipping
+    key :seller
     key :unit, Unit
-    key :venue, String
 
-    validates_presence_of :condition, :seller, :shipping, :unit, :venue
+    alias kosher? kosher
+    alias new? new
 
     def <=>(other)
       if kosher? != other.kosher?
@@ -19,13 +19,8 @@ module Kosher
       end
     end
 
-    def kosher?
-      validate!
-      [seller, shipping, condition].all?(&:kosher?)
-    end
-
     def price
-      unit.price + shipping.price
+      unit.price + shipping.cost
     end
   end
 end

data/lib/kosher/shipping.rb

@@ -1,15 +1,10 @@
 module Kosher
   class Shipping < Structure
-    include Filter
-    include Price
+    key :cents, Integer
+    key :currency
 
-    key :available, Boolean
-
-    validates_presence_of :available
-
-    def available?
-      validate!
-      available
+    def cost
+      Money.new(cents, currency)
     end
   end
 end

data/lib/kosher/unit.rb

@@ -1,7 +1,10 @@
 module Kosher
   class Unit < Structure
-    include Price
+    key :cents, Integer
+    key :currency, String
 
-    key :quantity, Integer, 1
+    def price
+      Money.new(cents, currency)
+    end
   end
 end

data/lib/kosher/version.rb

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

data/test/kosher_test.rb

@@ -1,51 +1,21 @@
-# encoding: UTF-8
 require 'minitest/autorun'
-
 require_relative '../lib/kosher'
-
 begin
   require 'pry'
-  rescue LoadError
+rescue LoadError
 end
 
 include Kosher
 
 class TestKosher < MiniTest::Unit::TestCase
-  def test_money
-    unit     = Unit.new(    :cents    => '1000',
-                            :currency => 'EUR')
-    shipping = Shipping.new(:available => true,
-                            :cents     => '300',
-                            :currency  => 'EUR')
-    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_validation
-    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,
-                            :cents     => 100,
-                            :currency  => 'USD')
-    assert shipping.kosher?
+  def test_prices
+    unit = Unit.new(cents: 100, currency: 'USD')
+    assert_equal '$1.00', unit.price.format
 
-    assert_raises(Structure::InvalidRecord) { Seller.new.kosher? }
-    seller = Seller.new(:name => 'John Doe')
-    assert seller.kosher?
+    ship = Shipping.new(cents: 100, currency: 'USD')
+    assert_equal '$1.00', ship.cost.format
 
-    assert_raises(Structure::InvalidRecord) { Offer.new.kosher? }
-    offer = Offer.new(:condition => condition,
-                      :shipping  => shipping,
-                      :seller    => seller,
-                      :unit      => Unit.new,
-                      :venue     => 'Amazon.com')
-    assert offer.kosher?
+    offer = Offer.new(unit: unit, shipping: ship)
+    assert_equal '$2.00', offer.price.format
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kosher
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-07 00:00:00.000000000Z
+date: 2011-10-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: &70296149797340 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70296149797340
 - !ruby/object:Gem::Dependency
   name: certainty
-  requirement: &70296149796480 !ruby/object:Gem::Requirement
+  requirement: &70249913314080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +21,10 @@ dependencies:
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70296149796480
+  version_requirements: *70249913314080
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &70296149795640 !ruby/object:Gem::Requirement
+  requirement: &70249913313320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,19 +32,19 @@ dependencies:
         version: '3.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70296149795640
+  version_requirements: *70249913313320
 - !ruby/object:Gem::Dependency
   name: structure
-  requirement: &70296149794680 !ruby/object:Gem::Requirement
+  requirement: &70249913312280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.22'
   type: :runtime
   prerelease: false
-  version_requirements: *70296149794680
-description: I filter things.
+  version_requirements: *70249913312280
+description: 
 email: code@papercavalier.com
 executables: []
 extensions: []
@@ -69,11 +58,7 @@ files:
 - Rakefile
 - kosher.gemspec
 - lib/kosher.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/version.rb
@@ -90,23 +75,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3818355639004243263
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3818355639004243263
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: I filter things.
+summary: A filter
 test_files:
 - test/kosher_test.rb

data/lib/kosher/condition.rb

@@ -1,18 +0,0 @@
-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 +0,0 @@
-module Kosher
-  module Filter
-    def self.included(base)
-      base.key :kosher, Boolean, true
-    end
-
-    def kosher?
-      validate!
-      kosher
-    end
-  end
-end

data/lib/kosher/price.rb

@@ -1,17 +0,0 @@
-module Kosher
-  module Price
-    def self.included(base)
-      base.key :cents, Integer
-      base.key :currency, String
-
-      base.validates_presence_of     :currency
-      base.validates_numericality_of :cents, :greater_than => 0
-    end
-
-    def price
-      validate!
-
-      Money.new(cents, currency)
-    end
-  end
-end

data/lib/kosher/seller.rb

@@ -1,11 +0,0 @@
-module Kosher
-  class Seller < Structure
-    include Filter
-
-    key :id, String
-    key :name, String
-    key :rating, Float
-
-    validates_presence_of :name
-  end
-end