toy-dynamo 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b009000e9ef292d89e89f980ff8696d92990f861
-  data.tar.gz: 29e1c1455056be654a8757834493f45c906e3ce6
+  metadata.gz: 55543749d5aada53a2339255fecf85562746b958
+  data.tar.gz: ae3a9255c0d8d90187c4de0651ea3e262cf9c807
 SHA512:
-  metadata.gz: 5fcef06c3655d1ad8d845616ed95b1a00d813705dd268255eb3b3109e5912fa78fc57ac715db5f505e9e9a5aa4b7be7f094acf067b9f7a3c0a01e6b37f3d1a0f
-  data.tar.gz: 768bef23ff4fb4cbf4298c1c9070f47ea437ff0347ddbcad253c95938c24c53e7d4c4bfa45750a9be3c21a7bca53da1ed4fac0b3af8fe879f461edce69878698
+  metadata.gz: 82d0ac9c53c7ec511df84d4afe592c946bf8567c5c1dce86c913b667937b033f9f408b71275c895a3a1889a03a1de7ecfc42ffea5345e2b006579c5a9e0c551f
+  data.tar.gz: 8e08548bbc6a408cc179d2f2c358e16f7b10eeef69aaf772ff14b1117a483a5d8f2fec85d26bf26a8a3efdd4595ffc89854f367255d35a0fb5ffe61eaece5983

data/lib/toy/dynamo/adapter.rb

@@ -11,8 +11,6 @@ module Toy
         options[:dynamo_db_endpoint] = config[:endpoint] || Toy::Dynamo::Config.endpoint
         options[:dynamo_db_port] = config[:port] || Toy::Dynamo::Config.port
 
-        options[:dynamo_db_endpoint] = config[:endpoint] || Toy::Dynamo::Config.endpoint
-        options[:dynamo_db_port] = config[:port] || Toy::Dynamo::Config.port
         options[:api_version] ||= config[:api_version] || '2012-08-10'
         #:dynamo_db_crc_32_check = false
 

data/lib/toy/dynamo/config.rb

@@ -15,7 +15,6 @@ module Toy
       option :logger, :default => defined?(Rails)
       option :read_provision, :default => 50
       option :write_provision, :default => 10
-      option :included_models, :default => []
       # TODO - default adapter client based on config
       #option :namespace, :default => defined?(Rails) ? "#{Rails.application.class.parent_name}_#{Rails.env}" : ""
       option :endpoint, :default => 'dynamodb.us-west-2.amazonaws.com'

data/lib/toy/dynamo/tasks.rb

@@ -1,5 +1,35 @@
 require 'rake'
 
+module Toy
+  module Dynamo
+    module Tasks
+      extend self
+      def included_models
+        dir = ENV['DIR'].to_s != '' ? ENV['DIR'] : Rails.root.join("app/models")
+        puts "Loading models from: #{dir}"
+        included = []
+        Dir.glob(File.join("#{dir}/**/*.rb")).each do |path|
+          model_filename = path[/#{Regexp.escape(dir.to_s)}\/([^\.]+).rb/, 1]
+          next if model_filename.match(/^concerns\//i) # Skip concerns/ folder
+          klass = model_filename.camelize.constantize
+
+          begin
+            klass = model_filename.camelize.constantize
+          rescue NameError
+            require(path) ? retry : raise
+          end
+
+          # Skip if the class doesn't have Toy::Dynamo integration
+          next unless klass.respond_to?(:dynamo_table)
+
+          included << klass
+        end
+        included
+      end
+    end
+  end
+end
+
 namespace :ddb do
   desc 'Create a DynamoDB table'
   task :create => :environment do
@@ -7,7 +37,7 @@ namespace :ddb do
     options = {}
     options.merge!(:table_name => ENV['TABLE']) if ENV['TABLE']
     if ENV["CLASS"] == "all"
-      Toy::Dynamo::Config.included_models.each do |klass|
+      Toy::Dynamo::Tasks.included_models.each do |klass|
         puts "Creating table for #{klass}..."
         begin
           klass.dynamo_table(:novalidate => true).create(options)
@@ -36,7 +66,7 @@ namespace :ddb do
     options = {}
     options.merge!(:table_name => ENV['TABLE']) if ENV['TABLE']
     if ENV["CLASS"] == "all"
-      Toy::Dynamo::Config.included_models.each do |klass|
+      Toy::Dynamo::Tasks.included_models.each do |klass|
         puts "Destroying table for #{klass}..."
         begin
           klass.dynamo_table(:novalidate => true).delete(options)

data/lib/toy/dynamo/version.rb

@@ -1,5 +1,5 @@
 module Toy
   module Dynamo
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toy-dynamo
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Cary Dunn