decanter 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db2d47fb35516ad171707804d74d599dfc9f4275
-  data.tar.gz: 9de4216e15cef03ab046d1dc68372ce3de6f834d
+  metadata.gz: 20aabb357aad0ae6ac3571bdc051640eee091e0a
+  data.tar.gz: 7e1015a86d9e56d0f647bd2c561b40795b471a2d
 SHA512:
-  metadata.gz: f5a4887ef4cebe7358b2a57a25ef558647ebc4760369636c91dd65aa266649e0a85df014f02b746849d3fd301f603cb865154349aedba8a8232684d0ff1da127
-  data.tar.gz: 3efb3ee49fc50aaa223c2205fe4e2ff9bde46fc482529510d86735bc16d31db7243f7d1e58bc2433b852f46ec74358312fb748544f268e37176c3c9512f35eb8
+  metadata.gz: ee971b831f97166213985551f11c36f22f6b4eddb89acb8e1559ab0344172ac08a7ddb88cc10ead3a744add6d950d0d127e79ee3129e2e0e4984b62529f53cdb
+  data.tar.gz: 394c5b2fe99e781fc393b1b27580269a202189261044d57b30a370e1ef2cc2d06c298238726d0a09f2988ca39d29b8649403a4dec3658f811e3e15890a8c7d1e

data/README.md

@@ -23,17 +23,6 @@ gem "decanter"
 bundle
 ```
 
-Add the following to application.rb so we can load your decanters properly:
-
-```
-config.paths.add "app/decanter", eager_load: true
-config.to_prepare do
-  Dir[ File.expand_path(Rails.root.join("app/decanter/**/*.rb")) ].each do |file|
-    require_dependency file
-  end
-end
-```
-
 Basic Usage
 ---
 
@@ -41,7 +30,7 @@ Basic Usage
 rails g decanter Trip name:string start_date:date end_date:date
 ```
 
-**app/decanter/decanters/trip_decanter.rb**
+**app/decanters/trip_decanter.rb**
 
 ```ruby
 class TripDecanter < Decanter::Base
@@ -137,7 +126,7 @@ From terminal we ran:
 rails g decanter Trip name:string start_date:date end_date:date
 ```
 
-Which generates app/decanter/decanters/trip_decanter.rb:
+Which generates app/decanters/trip_decanter.rb:
 
 ```ruby
 class TripDecanter < Decanter::Base
@@ -191,7 +180,7 @@ end
 You'll notice that the above ```parser do``` block takes a ```:parse_format``` option. This allows you to specify the format your date string will come in. For example, if you expect "2016-01-15" instead of "01/15/2016", you can adjust the TripDecanter like so:
 
 ```ruby
-# app/decanter/decanters/trip_decanter.rb
+# app/decanters/trip_decanter.rb
 
 class TripDecanter < Decanter::Base
   input :name, :string
@@ -206,7 +195,7 @@ You can add your own parser if you want more control over the logic, or if you h
 rails g parser Date
 ```
 
-**app/decanter/parsers/date_parser**
+**lib/decanter/parsers/date_parser**
 
 ```ruby
 class DateParser < Decanter::ValueParser::Base
@@ -245,7 +234,7 @@ rails g decanter Trip name destinations:has_many
 rails g decanter Destination city state arrival_date:date departure_date:date
 ```
 
-Which produces app/decanter/decanters/trip and app/decanter/decanters/destination:
+Which produces app/decanters/trip and app/decanters/destination:
 
 ```ruby
 class TripDecanter < Decanter::Base
@@ -293,7 +282,7 @@ rails g decanter SearchFilter start_date:date end_date:date city:string state:st
 ```
 
 ```ruby
-# app/decanter/decanters/search_filter_decanter.rb
+# app/decanters/search_filter_decanter.rb
 
 class SearchFilterDecanter < Decanter::Base
 
@@ -346,7 +335,7 @@ rails g parser SquashDate
 ```
 
 ```ruby
-# app/decanter/squashers/date_squasher.rb
+# lib/decanter/parsers/squash_date_parser.rb
 
 class SquashDateParser < Decanter::Parser::Base
   parser do |name, values, options|

data/lib/decanter.rb

@@ -1,3 +1,5 @@
+require 'active_support/all'
+
 module Decanter
 
   @@decanters = {}
@@ -13,12 +15,13 @@ module Decanter
     full_name = name.include?('Decanter') ? name : "#{name}Decanter"
     @@decanters[full_name] || (raise NameError.new("unknown decanter #{name}Decanter"))
   end
+
+  ActiveSupport.run_load_hooks(:decanter, self)
 end
 
 require 'decanter/version'
-require 'active_support/all'
 require 'decanter/base'
 require 'decanter/core'
 require 'decanter/extensions'
 require 'decanter/value_parser'
-require 'decanter/railtie' if defined? ::Rails::Railtie
+require 'decanter/railtie' if defined?(::Rails)

data/lib/decanter/extensions.rb

@@ -40,5 +40,11 @@ module Decanter
           .decant(args)
       end
     end
+
+    module ActiveRecord
+      def self.enable!
+        ::ActiveRecord::Base.include(Decanter::Extensions)
+      end
+    end
   end
 end

data/lib/decanter/railtie.rb

@@ -1,10 +1,19 @@
-require 'rails'
-require_relative 'extensions'
+require 'decanter'
 
 class Decanter::Railtie < Rails::Railtie
 
-  initializer 'decanter.configure' do
-    ActiveRecord::Base.include(Decanter::Extensions) if defined? ActiveRecord
+  initializer 'decanter.active_record' do
+    ActiveSupport.on_load :active_record do
+      require 'decanter/extensions'
+      Decanter::Extensions::ActiveRecord.enable!
+    end
+  end
+
+  config.to_prepare do
+    Dir[
+      File.expand_path(Rails.root.join("app/decanters/*")),
+      File.expand_path(Rails.root.join("lib/decanter/parsers/*"))
+    ].each { |file| require file }
   end
 
   generators do |app|

data/lib/decanter/version.rb

@@ -1,3 +1,3 @@
 module Decanter
-  VERSION = '0.6.3'
+  VERSION = '0.7.0'
 end

data/lib/generators/rails/decanter_generator.rb

@@ -10,7 +10,7 @@ module Rails
       class_option :parent, :type => :string, :desc => 'The parent class for the generated decanter'
 
       def create_decanter_file
-        template 'decanter.rb.erb', File.join('app/decanter/decanters', class_path, "#{file_name}_decanter.rb")
+        template 'decanter.rb.erb', File.join('app/decanters', class_path, "#{file_name}_decanter.rb")
       end
 
       private

data/lib/generators/rails/parser_generator.rb

@@ -7,7 +7,7 @@ module Rails
       class_option :parent, :type => :string, :desc => 'The parent class for the generated parser'
 
       def create_parser_file
-        template 'parser.rb.erb', File.join('app/decanter/parsers', class_path, "#{file_name}_parser.rb")
+        template 'parser.rb.erb', File.join('lib/decanter/parsers', class_path, "#{file_name}_parser.rb")
       end
 
       private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decanter
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Ryan Francis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport