invoicing 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 460fa683bd1ba56dede941135a9db41b2b7236cf
-  data.tar.gz: 0ab573110cdf7d5c6bb424b2f69880f2f3a6d347
+  metadata.gz: 9f3972f667d3265b67721b85f92ec36d6a112c53
+  data.tar.gz: 8a48030d2cec91e38d9cd13be8f689e0b255f563
 SHA512:
-  metadata.gz: cf54abdd39ade52d2c41ad3757cd4b4b482853bb189e0ac0fe8371a6b5641de5f702557159a61a3d0332a012493b0258420ed7624306b5ff8cb6edb8e306c7b8
-  data.tar.gz: 4a41f9ba2236663d0463348cf5880a89e4d54e4d342e59ba147de4d8d33a4a1ba607422112e6b6db2d18d86d68c7c4eeb124eace3c2c9af7ed81451026466edc
+  metadata.gz: 0c24c29ba8dd15f8d65bf4d091a7e6edcc3e8bb7189173b6f647fa771f2926fe6f2ede2e106452a39fd647b106f11d3a7d0cc0060b3c81ecd73ff87761bbd907
+  data.tar.gz: cbafde8f986ec7a4b9fb8d4da1b8ea0e28743f09a65783dbcb73ed857ef295cfb9549e5b64797aa7d30cb9cb3f48af2a9744c185224d3173d7164e4560050b49

data/README.md

@@ -7,8 +7,13 @@
 This is a framework for generating and displaying invoices (ideal for commercial
 Rails apps). It allows for flexible business logic; provides tools for tax handling,
 commission calculation etc. It aims to be both developer-friendly and
-accountant-friendly. Please visit invoicing [page](http://invoicing.codemancers.com/)
-for more information about how to install and use.
+accountant-friendly.
+
+## Documentation
+
+Detailed documentation about `invoicing` gem can be found on:
+
+http://invoicing.codemancers.com/
 
 ## Features
 

data/lib/invoicing/ledger_item.rb

@@ -376,17 +376,19 @@ module Invoicing
       }
 
       scope :sorted, lambda { |column|
+        table = ledger_item_class_info.method(quoted_table_name).to_s
         column = ledger_item_class_info.method(column).to_s
         if column_names.include?(column)
-          order("#{connection.quote_column_name(column)}, #{connection.quote_column_name(primary_key)}")
+          order("#{table}.#{connection.quote_column_name(column)}, #{table}.#{connection.quote_column_name(primary_key)}")
         else
-          order(connection.quote_column_name(primary_key))
+          order("#{table}.#{connection.quote_column_name(primary_key)}")
         end
       }
 
       scope :exclude_empty_invoices, lambda {
         line_items_assoc_id = ledger_item_class_info.method(:line_items).to_sym
-        line_items_refl = reflections[line_items_assoc_id]
+        line_items_refl = reflections[line_items_assoc_id] ||
+          reflections[line_items_assoc_id.to_s]
         line_items_table = line_items_refl.quoted_table_name
 
         # e.g. `ledger_items`.`id`

data/lib/invoicing/line_item.rb

@@ -164,18 +164,19 @@ module Invoicing
       # Dynamically created named scopes
       scope :in_effect, lambda {
         ledger_assoc = line_item_class_info.method(:ledger_item).to_sym
-        ledger_refl = reflections[ledger_assoc]
+        ledger_refl = reflections[ledger_assoc] || reflections[ledger_assoc.to_s]
         ledger_table = ledger_refl.table_name # not quoted_table_name because it'll be quoted again
         status_column = ledger_refl.klass.send(:ledger_item_class_info).method(:status)
         joins(ledger_assoc).where("#{ledger_table}.#{status_column}" => ['closed', 'cleared'])
       }
 
       scope :sorted, lambda { |column|
+        table = line_item_class_info.method(quoted_table_name).to_s
         column = line_item_class_info.method(column).to_s
         if column_names.include?(column)
-          order("#{connection.quote_column_name(column)}, #{connection.quote_column_name(primary_key)}")
+          order("#{table}.#{connection.quote_column_name(column)}, #{table}.#{connection.quote_column_name(primary_key)}")
         else
-          order(connection.quote_column_name(primary_key))
+          order("#{table}.#{connection.quote_column_name(primary_key)}")
         end
       }
     end

data/lib/invoicing/taxable.rb

@@ -250,7 +250,12 @@ module Invoicing
         @taxed_or_untaxed[attribute] = :untaxed
         @taxed_attributes[attribute] = nil
       elsif attribute =~ /^(#{attr_regex})_taxed$/
-        @attributes[attribute] = value
+        if ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR >= 2
+          @attributes.write_cast_value(attribute, value)
+        else
+          @attributes[attribute] = value
+        end
+
         @taxed_or_untaxed[$1] = :taxed
         @taxed_attributes[$1] = value
       end

data/lib/invoicing/version.rb

@@ -2,7 +2,7 @@ module Invoicing
   module Version
     MAJOR   = 1
     MINOR   = 0
-    BUILD   = 0
+    BUILD   = 1
 
     def to_a
       [MAJOR, MINOR, BUILD]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invoicing
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Martin Kleppmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: flexmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +107,7 @@ files:
 - lib/rails/generators/invoicing/tax_rate/tax_rate_generator.rb
 - lib/rails/generators/invoicing/tax_rate/templates/migration.rb
 - lib/rails/generators/invoicing/tax_rate/templates/model.rb
-homepage: http://ept.github.com/invoicing
+homepage: http://invoicing.codemancers.com/
 licenses: []
 metadata: {}
 post_install_message: 
@@ -140,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0.rc.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby Invoicing Framework