artfully_ose 1.0.0.rc3 → 1.0.0.rc4

data/app/models/item.rb

@@ -79,7 +79,9 @@ class Item < ActiveRecord::Base
   end
 
   def dup!
-    self.class.new(attributes.reject { |key, value| %w( id state ).include? key } )
+    new_item = self.dup
+    new_item.state = nil
+    new_item
   end
 
   def refundable?
@@ -101,7 +103,8 @@ class Item < ActiveRecord::Base
   # Should all be pulled out into state machine
   #
   def refund!
-    update_attribute(:state, "refunded")
+    self.state = "refunded"
+    self.save
   end
 
   def to_refund

data/app/models/refund.rb

@@ -13,9 +13,9 @@ class Refund
     return_items = options[:and_return] || false
 
     gateway = ActiveMerchant::Billing::BraintreeGateway.new(
-      :merchant_id => Artfully::Application.config.braintree.merchant_id,
-      :public_key  => Artfully::Application.config.braintree.public_key,
-      :private_key => Artfully::Application.config.braintree.private_key
+      :merchant_id => Rails.application.config.braintree.merchant_id,
+      :public_key  => Rails.application.config.braintree.public_key,
+      :private_key => Rails.application.config.braintree.private_key
     )
 
     if refund_amount > 0

data/lib/artfully_ose/version.rb

@@ -1,3 +1,3 @@
 module ArtfullyOse
-  VERSION = "1.0.0.rc3"
+  VERSION = "1.0.0.rc4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artfully_ose
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000Z
+date: 2012-08-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70219507146960 !ruby/object:Gem::Requirement
+  requirement: &70365913077320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70219507146960
+  version_requirements: *70365913077320
 - !ruby/object:Gem::Dependency
   name: transitions
-  requirement: &70219507146460 !ruby/object:Gem::Requirement
+  requirement: &70365913076760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *70219507146460
+  version_requirements: *70365913076760
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70219507146000 !ruby/object:Gem::Requirement
+  requirement: &70365913076220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70219507146000
+  version_requirements: *70365913076220
 - !ruby/object:Gem::Dependency
   name: devise_invitable
-  requirement: &70219507206960 !ruby/object:Gem::Requirement
+  requirement: &70365913075700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70219507206960
+  version_requirements: *70365913075700
 - !ruby/object:Gem::Dependency
   name: devise_suspendable
-  requirement: &70219507206500 !ruby/object:Gem::Requirement
+  requirement: &70365913075040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70219507206500
+  version_requirements: *70365913075040
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &70219507206120 !ruby/object:Gem::Requirement
+  requirement: &70365913074220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70219507206120
+  version_requirements: *70365913074220
 - !ruby/object:Gem::Dependency
   name: braintree
-  requirement: &70219507205580 !ruby/object:Gem::Requirement
+  requirement: &70365913073640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 2.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70219507205580
+  version_requirements: *70365913073640
 - !ruby/object:Gem::Dependency
   name: delayed_job
-  requirement: &70219507205080 !ruby/object:Gem::Requirement
+  requirement: &70365913073100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,10 +98,10 @@ dependencies:
         version: 3.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70219507205080
+  version_requirements: *70365913073100
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
-  requirement: &70219507204620 !ruby/object:Gem::Requirement
+  requirement: &70365913072240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,10 +109,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70219507204620
+  version_requirements: *70365913072240
 - !ruby/object:Gem::Dependency
   name: activerecord-import
-  requirement: &70219507204160 !ruby/object:Gem::Requirement
+  requirement: &70365913071660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,10 +120,10 @@ dependencies:
         version: 0.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70219507204160
+  version_requirements: *70365913071660
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &70219507203700 !ruby/object:Gem::Requirement
+  requirement: &70365913071040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70219507203700
+  version_requirements: *70365913071040
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70219507203320 !ruby/object:Gem::Requirement
+  requirement: &70365913070240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70219507203320
+  version_requirements: *70365913070240
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70219507202780 !ruby/object:Gem::Requirement
+  requirement: &70365913069680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70219507202780
+  version_requirements: *70365913069680
 - !ruby/object:Gem::Dependency
   name: bootstrap-will_paginate
-  requirement: &70219507202360 !ruby/object:Gem::Requirement
+  requirement: &70365913061540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70219507202360
+  version_requirements: *70365913061540
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70219507201900 !ruby/object:Gem::Requirement
+  requirement: &70365913061080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70219507201900
+  version_requirements: *70365913061080
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70219507201400 !ruby/object:Gem::Requirement
+  requirement: &70365913060400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: 2.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70219507201400
+  version_requirements: *70365913060400
 - !ruby/object:Gem::Dependency
   name: comma
-  requirement: &70219507200900 !ruby/object:Gem::Requirement
+  requirement: &70365913059620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -197,10 +197,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70219507200900
+  version_requirements: *70365913059620
 - !ruby/object:Gem::Dependency
   name: s3
-  requirement: &70219507200440 !ruby/object:Gem::Requirement
+  requirement: &70365913058960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: 0.3.11
   type: :runtime
   prerelease: false
-  version_requirements: *70219507200440
+  version_requirements: *70365913058960
 - !ruby/object:Gem::Dependency
   name: validates_timeliness
-  requirement: &70219507200060 !ruby/object:Gem::Requirement
+  requirement: &70365913058380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70219507200060
+  version_requirements: *70365913058380
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
-  requirement: &70219507199520 !ruby/object:Gem::Requirement
+  requirement: &70365913057540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -230,10 +230,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70219507199520
+  version_requirements: *70365913057540
 - !ruby/object:Gem::Dependency
   name: gravatar_image_tag
-  requirement: &70219502963960 !ruby/object:Gem::Requirement
+  requirement: &70365913057120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70219502963960
+  version_requirements: *70365913057120
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70219503273040 !ruby/object:Gem::Requirement
+  requirement: &70365913056540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -252,10 +252,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70219503273040
+  version_requirements: *70365913056540
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &70219503275400 !ruby/object:Gem::Requirement
+  requirement: &70365913055960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -263,10 +263,10 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70219503275400
+  version_requirements: *70365913055960
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &70219503277300 !ruby/object:Gem::Requirement
+  requirement: &70365913055340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -274,10 +274,10 @@ dependencies:
         version: 2.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70219503277300
+  version_requirements: *70365913055340
 - !ruby/object:Gem::Dependency
   name: gibbon
-  requirement: &70219503304300 !ruby/object:Gem::Requirement
+  requirement: &70365913054740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -285,10 +285,10 @@ dependencies:
         version: 0.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70219503304300
+  version_requirements: *70365913054740
 - !ruby/object:Gem::Dependency
   name: set_watch_for
-  requirement: &70219503589740 !ruby/object:Gem::Requirement
+  requirement: &70365913053880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -296,10 +296,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70219503589740
+  version_requirements: *70365913053880
 - !ruby/object:Gem::Dependency
   name: swiper
-  requirement: &70219506725960 !ruby/object:Gem::Requirement
+  requirement: &70365913053380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -307,10 +307,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70219506725960
+  version_requirements: *70365913053380
 - !ruby/object:Gem::Dependency
   name: restful_metrics
-  requirement: &70219507184320 !ruby/object:Gem::Requirement
+  requirement: &70365913052920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -318,10 +318,10 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70219507184320
+  version_requirements: *70365913052920
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &70219507261880 !ruby/object:Gem::Requirement
+  requirement: &70365913052280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -329,10 +329,10 @@ dependencies:
         version: 2.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70219507261880
+  version_requirements: *70365913052280
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
-  requirement: &70219511477880 !ruby/object:Gem::Requirement
+  requirement: &70365913051600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -340,7 +340,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *70219511477880
+  version_requirements: *70365913051600
 description: A Ruby on Rails engine for running ticketing, CRM, and order management.  See
   http://fracturedatlas.github.com/artfully_app/ for the reference implementation
 email: