RubyGems - kosher - Versions diffs - 0.10.0 → 0.11.0 - Mend

kosher 0.10.0 → 0.11.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

data/Gemfile CHANGED Viewed

@@ -2,3 +2,7 @@ source 'http://rubygems.org'
 gemspec
 gem 'rake'
+unless ENV['CI']
+  gem 'ruby-debug19', :platforms => :mri_19
+end

data/README.md CHANGED Viewed

@@ -1,5 +1,3 @@
 # Kosher
 [![travis](https://secure.travis-ci.org/hakanensari/kosher.png)](http://travis-ci.org/hakanensari/kosher)
-Online trading, abstracted.

data/kosher.gemspec CHANGED Viewed

@@ -9,13 +9,15 @@ Gem::Specification.new do |s|
   s.authors     = ['Hakan Ensari']
   s.email       = 'code@papercavalier.com'
   s.homepage    = 'https://github.com/hakanensari/kosher'
-  s.summary     = %q{Online trade, abstracted}
-  s.description = %q{Online trade, abstracted}
+  s.summary     = %q{Online selling, abstracted}
+  s.description = %q{Online selling, abstracted}
   {
-    'activemodel' => '~> 3.0',
-    'money'       => '~> 3.7',
-    'structure'   => '~> 0.15'
+    'activesupport' => '~> 3.0',
+    'activemodel'   => '~> 3.0',
+    'certainty'     => '~> 0.2',
+    'money'         => '~> 3.7',
+    'structure'     => '~> 0.18'
   }.each do |lib, version|
     s.add_runtime_dependency lib, version
   end

data/lib/kosher/base.rb ADDED Viewed

@@ -0,0 +1,19 @@
+module Kosher
+  module Base
+    extend ActiveSupport::Concern
+    include ActiveModel::Validations
+    included do
+      key :foo
+      key :kosher, Boolean, :default => true
+    end
+    def kosher?
+      unless valid?
+        raise StandardError.new(errors.full_messages.join(', '))
+      end
+      kosher
+    end
+  end
+end

data/lib/kosher/offer.rb CHANGED Viewed

@@ -1,31 +1,35 @@
+require 'kosher/base'
+require 'kosher/price'
+require 'kosher/seller'
+require 'kosher/shipping'
+require 'kosher/unit'
+require 'kosher/venue'
 module Kosher
   class Offer < Structure
-    include ActiveModel::Validations
     include Comparable
     key :id
-    one :seller
-    one :shipping
-    one :unit
+    key :seller
+    key :shipping
+    key :unit
     key :venue_id, Integer
-    validates_presence_of :seller, :shipping, :unit, :venue
     def <=>(other)
       if kosher? != other.kosher?
         kosher? ? -1 : 1
       else
-        total <=> other.total
+        price <=> other.price
       end
     end
     def kosher?
-      raise Invalid.new(self) unless valid?
-      seller.kosher? && shipping.kosher? && unit.kosher?
+      [seller, shipping, unit].all?(&:kosher?)
     end
     def price
-      unit.price + shipping.cost
+      unit.price + shipping.price
     end
     def venue

data/lib/kosher/price.rb ADDED Viewed

@@ -0,0 +1,18 @@
+module Kosher
+  module Price
+    extend ActiveSupport::Concern
+    included do
+      key :cents,    Integer
+      key :currency, String
+      validates_presence_of     :currency
+      validates_numericality_of :cents,
+                                :greater_than => 0
+    end
+    def price
+      Money.new(cents, currency)
+    end
+  end
+end

data/lib/kosher/seller.rb CHANGED Viewed

@@ -1,13 +1,11 @@
 module Kosher
   class Seller < Structure
+    include Base
     key :id
-    key :kosher, Boolean, :default => true
     key :name
     key :rating, Float
-    # Returns whether the item is kosher.
-    def kosher?
-      kosher
-    end
+    validates_presence_of :name
   end
 end

data/lib/kosher/shipping.rb CHANGED Viewed

@@ -1,25 +1,10 @@
 module Kosher
   class Shipping < Structure
-    include ActiveModel::Validations
+    include Base
+    include Price
-    key :available
-    key :cents,    Integer
-    key :currency
-    key :kosher,   Boolean, :default => true
+    key :available, Boolean
-    validates_presence_of     :currency, :available
-    validates_numericality_of :cents,
-                              :greater_than => 0
-    # Shipping cost.
-    def cost
-      Money.new(cents, currency)
-    end
-    # Returns whether the item is kosher.
-    def kosher?
-      raise Invalid.new(self) unless valid?
-      kosher
-    end
+    validates_presence_of :available
   end
 end

data/lib/kosher/unit.rb CHANGED Viewed

@@ -1,28 +1,20 @@
 module Kosher
   class Unit < Structure
-    include ActiveModel::Validations
+    include Base
+    include Price
-    key :cents,      Integer
-    key :condition,  Integer
-    key :currency
-    key :description
-    key :kosher,     Boolean, :default => true
-    key :quantity,   Integer, :default => 1
+    key :condition,   Integer
+    key :description, String
+    key :quantity,    Integer, :default => 1
-    validates_inclusion_of    :condition, :in => 1..6
-    validates_numericality_of :cents,
-                              :greater_than => 0
-    validates_presence_of     :currency
+    validates_inclusion_of :condition, :in => 1..6
-    # Returns whether the item is kosher.
-    def kosher?
-      raise Invalid.new(self) unless valid?
-      kosher
+    def new?
+      condition == 1
     end
-    # Item price.
-    def price
-      Money.new(cents, currency)
+    def used?
+      !new?
     end
   end
 end

data/lib/kosher/venue.rb CHANGED Viewed

@@ -1,19 +1,12 @@
 module Kosher
   class Venue < Structure
-    include Static
-    set_data_path File.expand_path("../../../data/venues.yml", __FILE__)
-    # The name of the venue.
+    key :country
     key :name
-    # The country the venue is based in.
-    key :country
+    set_data_file File.expand_path("../../../data/venues.yml", __FILE__)
-    class << self
-      def amazon
-        @amazons ||= select { |record| record.name.include? 'Amazon' }
-      end
+    def self.amazon
+      @amazons ||= find_all { |e| e.name.include? 'Amazon' }
     end
   end
 end

data/lib/kosher/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Kosher
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

data/lib/kosher.rb CHANGED Viewed

@@ -1,13 +1,7 @@
+require 'active_support/concern'
 require 'active_model'
+require 'certainty'
 require 'money'
 require 'structure'
-module Kosher
-  autoload :Invalid,  'kosher/invalid'
-  autoload :Item,     'kosher/item'
-  autoload :Offer,    'kosher/offer'
-  autoload :Seller,   'kosher/seller'
-  autoload :Shipping, 'kosher/shipping'
-  autoload :Unit,     'kosher/unit'
-  autoload :Venue,    'kosher/venue'
-end
+require 'kosher/offer'

data/test/kosher_test.rb CHANGED Viewed

@@ -3,64 +3,62 @@ require 'minitest/autorun'
 require_relative '../lib/kosher'
+begin
+  require 'ruby-debug'
+  rescue LoadError
+end
+include Kosher
 class TestKosher < MiniTest::Unit::TestCase
-  def test_unit_price
-    unit = Kosher::Unit.new(:cents    => '100',
-                            :currency => 'JPY')
-    assert_equal '¥1.00', unit.price.format
-  end
+  def test_prices
+    unit = Unit.new(:cents    => '1000',
+                    :currency => 'EUR')
+    assert_equal '10,00 €', unit.price.format
-  def test_shipping_cost
-    shipping = Kosher::Shipping.new(:cents    => '100',
-                                    :currency => 'EUR')
-    assert_equal '1,00 €', shipping.cost.format
-  end
+    shipping = Shipping.new(:cents    => '300',
+                            :currency => 'EUR')
+    assert_equal '3,00 €', shipping.price.format
-  def test_offer_price
-    shipping = Kosher::Shipping.new(:cents    => 100,
-                                    :currency => 'USD')
-    unit = Kosher::Unit.new(:cents    => 100,
-                            :currency => 'USD')
-    offer = Kosher::Offer.new(:shipping => shipping,
-                              :unit     => unit)
-    assert_equal '$2.00', offer.price.format
+    offer = Offer.new(:shipping => shipping,
+                      :unit     => unit)
+    assert_equal '13,00 €', offer.price.format
   end
-  def test_venue
-    assert_equal 'Amazon.com', Kosher::Venue.find(1).name
-    assert_equal 'Amazon.co.uk', Kosher::Venue.find(2).name
-  end
+  def test_venues
+    assert_equal 'Amazon.com',   Venue.find(1).name
+    assert_equal 'Amazon.co.uk', Venue.find(2).name
-  def test_venue_in_offer
-    offer = Kosher::Offer.new(:venue_id => 1)
-    assert_equal Kosher::Venue.find(1), offer.venue
+    offer = Offer.new(:venue_id => 1)
+    assert_equal Venue.find(1), offer.venue
   end
   def test_validation
-    assert_raises(Kosher::Invalid) { Kosher::Unit.new.kosher? }
-    unit = Kosher::Unit.new(:condition => 1,
-                            :cents     => 100,
-                            :currency  => 'USD')
+    assert_raises(StandardError) { Unit.new.kosher? }
+    unit = Unit.new(:condition => 1,
+                    :cents     => 100,
+                    :currency  => 'USD')
     assert unit.kosher?
-    assert_raises(Kosher::Invalid) { Kosher::Shipping.new.kosher? }
-    shipping = Kosher::Shipping.new(:available => true,
-                                    :cents     => 100,
-                                    :currency  => 'USD')
+    assert_raises(StandardError) { Shipping.new.kosher? }
+    shipping = Shipping.new(:available => true,
+                            :cents     => 100,
+                            :currency  => 'USD')
     assert shipping.kosher?
-    assert_raises(Kosher::Invalid) { Kosher::Offer.new.kosher? }
-    offer = Kosher::Offer.new(:unit     => unit,
-                              :shipping => shipping,
-                              :seller   => Kosher::Seller.new,
-                              :venue_id => 1)
-    assert offer.kosher?
+    assert_raises(StandardError) { Seller.new.kosher? }
+    seller = Seller.new(:name => 'John Doe')
+    assert seller.kosher?
-    offer.venue_id = 0
-    assert_raises(Kosher::Invalid) { offer.kosher? }
+    assert_raises(NoMethodError) { Offer.new.kosher? }
+    offer = Offer.new(:unit     => unit,
+                      :shipping => shipping,
+                      :seller   => seller,
+                      :venue_id => 1)
+    assert offer.kosher?
   end
   def test_amazon_venues
-    assert_equal 8, Kosher::Venue.amazon.size
+    assert_equal 8, Venue.amazon.size
   end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kosher
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
   prerelease:
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-08-13 00:00:00.000000000Z
+date: 2011-08-26 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70121457070860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70121457070860
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70291732975860 !ruby/object:Gem::Requirement
+  requirement: &70121457069980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +32,21 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70291732975860
+  version_requirements: *70121457069980
+- !ruby/object:Gem::Dependency
+  name: certainty
+  requirement: &70121457069440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70121457069440
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &70291732975020 !ruby/object:Gem::Requirement
+  requirement: &70121457068900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,19 +54,19 @@ dependencies:
         version: '3.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70291732975020
+  version_requirements: *70121457068900
 - !ruby/object:Gem::Dependency
   name: structure
-  requirement: &70291732974260 !ruby/object:Gem::Requirement
+  requirement: &70121457068360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.18'
   type: :runtime
   prerelease: false
-  version_requirements: *70291732974260
-description: Online trade, abstracted
+  version_requirements: *70121457068360
+description: Online selling, abstracted
 email: code@papercavalier.com
 executables: []
 extensions: []
@@ -59,8 +81,9 @@ files:
 - data/venues.yml
 - kosher.gemspec
 - lib/kosher.rb
-- lib/kosher/invalid.rb
+- lib/kosher/base.rb
 - lib/kosher/offer.rb
+- lib/kosher/price.rb
 - lib/kosher/seller.rb
 - lib/kosher/shipping.rb
 - lib/kosher/unit.rb
@@ -81,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3228881349343595223
+      hash: 2657274426638176480
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -90,12 +113,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3228881349343595223
+      hash: 2657274426638176480
 requirements: []
 rubyforge_project:
 rubygems_version: 1.8.6
 signing_key:
 specification_version: 3
-summary: Online trade, abstracted
+summary: Online selling, abstracted
 test_files:
 - test/kosher_test.rb

data/lib/kosher/invalid.rb DELETED Viewed

@@ -1,7 +0,0 @@
-module Kosher
-  class Invalid < StandardError
-    def initialize(record)
-      super(record.errors.full_messages.join(", "))
-    end
-  end
-end