simplificator-billboard-api 0.7.2 → 0.9.1

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = "info@simplificator.com"
     gem.homepage = "http://github.com/simplificator/billboard-api"
     gem.authors = ["simplificator"]
-    gem.add_development_dependency "thoughtbot-shoulda"
+    gem.add_development_dependency "shoulda"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.9.1

data/lib/billboard-api.rb

@@ -1,8 +1,8 @@
-require 'rubygems'
-require 'activeresource'
-require 'singleton'
+require "rubygems"
+require "active_resource"
+require "singleton"
 
-%w[order customer payment_method currency tax config default_config].each do |name|
-  require File.join(File.dirname(__FILE__), 'billboard-api', name)
+%w[config remote_resource order customer payment_method currency tax].each do |name|
+  require File.join(File.dirname(__FILE__), "billboard-api", name)
 end
 

data/lib/billboard-api/config.rb

@@ -1,83 +1,29 @@
 module BillboardApi
-  
-  #
-  # Following Settings are required:
-  #  * return_after_payment_url
-  #  * paypal_service_url
-  #  * paypal_notify_url
-  #  * paypal_receiver_email
-  #  * site_url
-  
-  
-  #
-  # Config is a singleton instance which can be used in two ways:
-  # Config.instance.setting_name1 = 12
-  # Config.instance.setting_name2 = 24
-  # or the (shorter, depending on amount of settings) form with a block
-  # Config.configure do |config|
-  #  config.setting_name1= 12
-  #  config.setting_name2= 24
-  # end 
-  #
-  #
-  # the accessors have possibility to override
-  # settings. This is useful for custom settings on a lower level
-  #
-  # config.setting_name1(12)
-  # => will return 12 all the time which does not make much sense...
-  # config.setting_name(options[:override_setting_name1]) will return the not-nil value from options has
-  # or the setting stored in config.
-  #
   class Config
     include Singleton
-    
-    REQUIRED_SETTINGS = [:return_after_payment_url, :paypal_service_url, :paypal_notify_url, :paypal_receiver_email, :site_url]
-    
-    # Overwrite site urls since they are directly applied to the 
-    # Order class' class variable 'site'
-    def site_url(override = nil)
-      override || ActiveResource::Base.site
-    end
-    def site_url=(value)
-      ActiveResource::Base.site= value
-    end
-        
-    # Allow access for arbitrary settings    
-    def method_missing(m, *args)
-      if !m.to_s.ends_with?('=') && args.length <= 1
-        # return override or setting
-        args.first || settings[m.to_s]
-      elsif m.to_s.ends_with?('=') && args.length == 1
-        settings[m.to_s[0...-1]] = args.first
+
+    attr_reader :url
+    attr_accessor :paypal_service_url
+
+    def initialize
+      if production?
+        self.url = "https://simplebillboard.com"
+        self.paypal_service_url = "https://www.paypal.com/cgi-bin/webscr?"
       else
-        super(m, args)
+        self.url = "https://simplebillboard.com.simplificator.com"
+        self.paypal_service_url = "https://www.sandbox.paypal.com/cgi-bin/webscr?"
       end
     end
-    
-    # Helper method to ensure all settings are present.
-    # Will raise a StandardError if Config is invalid.
-    def validate!
-      REQUIRED_SETTINGS.each do |name|
-        raise "Settings '#{name}' is required. Use 'Config.instance.#{name}= VALUE' to set a value" unless self.send(name) 
-      end
-    end
- 
-    def clear!
-      @settings = {}
-      site_url = nil
-      nil
-    end
-    
-    # Configure with a block
-    # will yield the instance of Config to the block.
-    def self.configure(&block)
-      config = Config.instance
-      yield(instance) if block_given?
+
+    def url=(value)
+      RemoteResource.site = value
+      @url = value
     end
-    
+
     private
-    def settings
-      @settings ||= {}
+
+    def production?
+      !(defined? Rails) || Rails.env.production?
     end
   end
 end

data/lib/billboard-api/currency.rb

@@ -1,5 +1,4 @@
 module BillboardApi
-  class Currency < ActiveResource::Base
-#    self.site = "http://billboard.garden.u2.simplificator.com"
+  class Currency < RemoteResource
   end
 end

data/lib/billboard-api/customer.rb

@@ -1,5 +1,4 @@
 module BillboardApi
-  class Customer < ActiveResource::Base
-#    self.site = "http://billboard.garden.u2.simplificator.com"
+  class Customer < RemoteResource
   end
 end

data/lib/billboard-api/order.rb

@@ -1,42 +1,4 @@
 module BillboardApi
-  class Order < ActiveResource::Base
-    
-    # Create an URL which can be used to redirect the client to paypal.
-    # It will include information about the order (id), amount, currency and so on.
-    # Some options can be overriden by using the options hash.
-    #  * paypal_notify_url
-    #  * paypal_receiver_email
-    #  * return_after_payment_url
-    # 
-    def paypal_url(options = {})
-       values = {
-         :business => BillboardApi::Config.instance.paypal_receiver_email(options[:paypal_receiver_email]),
-         :return => BillboardApi::Config.instance.return_after_payment_url(options[:return_after_payment_url]),
-         :invoice => "#{self.business_id}_#{self.id}",
-         :cmd => '_cart',
-         :upload => 1,
-         :currency_code => self.currency,
-       }
-       values[:notify_url] = BillboardApi::Config.instance.paypal_notify_url(options[:paypal_notify_url])
-
-       self.line_items_attributes.each_with_index do |line_item, index|
-         values.merge!({
-           "amount_#{index + 1}" => "%0.2f" % line_item.price_francs.to_f,
-           "item_name_#{index + 1}" => line_item.description,
-           "item_number_#{index + 1}" => line_item.id,
-           "quantity_#{index + 1}" => line_item.amount
-         })
-       end
-
-       unless self.vat_total == 0
-         values.merge!({
-           "amount_#{self.line_items.size + 1}" => "%0.2f" % (self.vat_total.to_f / 100),
-           "item_name_#{self.line_items.size + 1}" => "MwSt.",
-           "quantity_#{self.line_items.size + 1}" => 1
-         })
-       end
-       
-       "#{BillboardApi::Config.instance.paypal_service_url}?#{values.to_query}"
-     end
+  class Order < RemoteResource
   end
 end

data/lib/billboard-api/payment_method.rb

@@ -1,5 +1,4 @@
 module BillboardApi
-  class PaymentMethod < ActiveResource::Base
-#    self.site = "http://billboard.garden.u2.simplificator.com"
+  class PaymentMethod < RemoteResource
   end
 end

data/lib/billboard-api/queue.rb

@@ -0,0 +1,16 @@
+module BillboardApi
+  class Queue < ActiveRecord::Base
+    serialize :serialized_order
+    serialize :serialized_customer
+    
+    
+    # name retry is a keyword in ruby
+    def try_again
+      customer = self.serialized_customer
+      order = self.serialized_order
+      order.customer_id = customer.id # ID from Billboard
+      
+      order.save # request to billboard
+    end
+  end
+end

data/lib/billboard-api/remote_resource.rb

@@ -0,0 +1,6 @@
+module BillboardApi
+  # Common superclass to all ActiveResources in Billboard.
+  class RemoteResource < ActiveResource::Base
+    self.site = BillboardApi::Config.instance.url
+  end
+end

data/lib/billboard-api/tax.rb

@@ -1,4 +1,4 @@
 module BillboardApi
-  class Tax < ActiveResource::Base
+  class Tax < RemoteResource
   end
 end

data/simplificator-billboard-api.gemspec

@@ -0,0 +1,61 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{simplificator-billboard-api}
+  s.version = "0.9.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["simplificator"]
+  s.date = %q{2011-03-11}
+  s.description = %q{Billboard-API is needed to add the additional models for the billboard application.}
+  s.email = %q{info@simplificator.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/billboard-api.rb",
+    "lib/billboard-api/config.rb",
+    "lib/billboard-api/currency.rb",
+    "lib/billboard-api/customer.rb",
+    "lib/billboard-api/order.rb",
+    "lib/billboard-api/payment_method.rb",
+    "lib/billboard-api/queue.rb",
+    "lib/billboard-api/remote_resource.rb",
+    "lib/billboard-api/tax.rb",
+    "simplificator-billboard-api.gemspec",
+    "test/billboard-api_test.rb",
+    "test/config_test.rb",
+    "test/test_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/simplificator/billboard-api}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.5.0}
+  s.summary = %q{Billboard API gem}
+  s.test_files = [
+    "test/billboard-api_test.rb",
+    "test/config_test.rb",
+    "test/test_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+    else
+      s.add_dependency(%q<shoulda>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<shoulda>, [">= 0"])
+  end
+end
+

data/test/config_test.rb

@@ -2,60 +2,13 @@ require 'test_helper'
 require 'uri'
 class ConfigTest < Test::Unit::TestCase
   include BillboardApi
+
   def setup
     @config = Config.instance
-    @config.clear!
   end
-  should "Return nil on unknown config" do
-        assert_equal nil, @config.test_property
-      end
-      
-      should 'return the value upon set operation' do
-        assert 'test', (@config.test_property= 'test')
-      end
-      
-  should 'store and return a setting' do
-    assert 'test', (@config.test_property= 'test')
-    assert 'test', @config.test_property
-  end
-  
-  should 'update an existing property' do
-    assert 'bla', (@config.test_property= 'bla')
-    assert 'bla', @config.test_property
-    assert 'test', (@config.test_property= 'test')
-    assert 'test', @config.test_property
-  end
-  
-  
-  should 'Allow configuration trough block' do
-    Config.configure do |conf|
-      conf.foobar= 'http://foo.bar'
-    end
-    assert_equal 'http://foo.bar', @config.foobar
-  end
-  
-  
-  should 'allow override of setting' do
-    @config.bla = 12
-    assert_equal 13, @config.bla(13)
-  end
-  
-  should 'validate! only if all required settings are present' do
-    assert_raises RuntimeError do
-      Config.instance.validate!  
-    end
-    Config.configure do |config|
-      config.return_after_payment_url= '1'
-      config.paypal_service_url= 2
-      config.paypal_notify_url= 3
-      config.paypal_receiver_email= 4
-      config.site_url = 'http://localhost:3000'
-    end
-    Config.instance.validate!
-  end
-  
-  should 'set site_url to Tax and Order' do
-      Config.instance.site_url = 'http://foo.bar.com'
+
+  should 'set url to Tax and Order' do
+      Config.instance.url = 'http://foo.bar.com'
       assert_equal 'http://foo.bar.com', Order.site.to_s
       assert_equal 'http://foo.bar.com', Tax.site.to_s
   end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: simplificator-billboard-api
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - simplificator
@@ -9,19 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 +01:00
+date: 2011-03-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: shoulda
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 description: Billboard-API is needed to add the additional models for the billboard application.
 email: info@simplificator.com
 executables: []
@@ -33,20 +40,20 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
-- billboard-api.gemspec
 - lib/billboard-api.rb
 - lib/billboard-api/config.rb
 - lib/billboard-api/currency.rb
 - lib/billboard-api/customer.rb
-- lib/billboard-api/default_config.rb
 - lib/billboard-api/order.rb
 - lib/billboard-api/payment_method.rb
+- lib/billboard-api/queue.rb
+- lib/billboard-api/remote_resource.rb
 - lib/billboard-api/tax.rb
+- simplificator-billboard-api.gemspec
 - test/billboard-api_test.rb
 - test/config_test.rb
 - test/test_helper.rb
@@ -55,26 +62,28 @@ homepage: http://github.com/simplificator/billboard-api
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Billboard API gem

data/.gitignore

@@ -1,6 +0,0 @@
-*.sw?
-.DS_Store
-coverage
-rdoc
-pkg
-nbproject

data/billboard-api.gemspec

@@ -1,63 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{billboard-api}
-  s.version = "0.7.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["simplificator"]
-  s.date = %q{2009-08-28}
-  s.description = %q{Billboard-API is needed to add the additional models for the billboard application.}
-  s.email = %q{info@simplificator.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "billboard-api.gemspec",
-     "lib/billboard-api.rb",
-     "lib/billboard-api/config.rb",
-     "lib/billboard-api/currency.rb",
-     "lib/billboard-api/customer.rb",
-     "lib/billboard-api/default_config.rb",
-     "lib/billboard-api/order.rb",
-     "lib/billboard-api/payment_method.rb",
-     "lib/billboard-api/tax.rb",
-     "test/billboard-api_test.rb",
-     "test/config_test.rb",
-     "test/test_helper.rb"
-  ]
-  s.has_rdoc = true
-  s.homepage = %q{http://github.com/simplificator/billboard-api}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{TODO: one-line summary of your gem}
-  s.test_files = [
-    "test/billboard-api_test.rb",
-     "test/config_test.rb",
-     "test/test_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-  end
-end

data/lib/billboard-api/default_config.rb

@@ -1,20 +0,0 @@
-puts "default config"
-BillboardApi::Config.configure do |config|
-  
-  # if running from rails, then set values depending on environment
-  if defined? RAILS_ENV
-    if RAILS_ENV == 'test'
-      config.paypal_service_url = "https://www.sandbox.paypal.com/cgi-bin/webscr?"
-    elsif RAILS_ENV == 'development'
-      config.paypal_service_url = "https://www.sandbox.paypal.com/cgi-bin/webscr?"
-    elsif RAILS_ENV == 'staging'
-      config.paypal_service_url = "https://www.sandbox.paypal.com/cgi-bin/webscr?"
-    elsif RAILS_ENV == 'production'
-      config.paypal_service_url = "https://www.paypal.com/cgi-bin/webscr?"
-    end
-  else 
-    puts "Not in rails, no defaults set"
-  end
-  # default values
-  config.site_url = 'http://billboard.garden.u2.simplificator.com'
-end