dynamodb_model 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebb8c152e61da170579ab144ccd846db12c32183
-  data.tar.gz: 6a730d72947f0226cf2a5584876f26f9fee6c9cb
+  metadata.gz: eaf77d31c24af901f7763c0c1ef41a9826fa7a39
+  data.tar.gz: a8d44492a552c139905c932d99235ccb9fdadc28
 SHA512:
-  metadata.gz: 859d701784e3a04af34f8757cd7f827fd811a4c41332526a546d7823609ae2f91f97f414dae8742a354ef63d4b3a5b5a8789ce60e8ad5cc92f9d90de3c100149
-  data.tar.gz: 7c59f80c2167cde76f604b420f1fd2d584be8373de065e2cb7218bb1ec30861b689346a3ccc535b91f96b6a16d7440172a973481959f0c5b7cf7b2d460ed72b4
+  metadata.gz: 3246ab2a294b39d83bd33f9dede7d69fb786f039c647310c3c8a0b27e0a35531f0cb0686c0b7befcd8c81fe2f5e016d4e0560dbfde6493af5d93b9cb92e75f13
+  data.tar.gz: ed45418a301d6e72d040bd5d9cdbcd9b8f3cfb7fee09d93d37fcfa42af44befe38d4ffe3fbacee621f91f3c63723117d20f3f054137177444269fd7f760361d6

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [1.0.5]
+- fix jets dynamodb:migrate tip
+
+## [1.0.4]
+- Add and use log method instead of puts to write to stderr by default
+
 ## [1.0.3]
 - rename APP_ROOT to JETS_ROOT
 

data/lib/dynamodb_model.rb

@@ -15,8 +15,9 @@ module DynamodbModel
   autoload :Dsl, "dynamodb_model/dsl"
   autoload :DbConfig, "dynamodb_model/db_config"
   autoload :Item, "dynamodb_model/item"
-  autoload :Util, "dynamodb_model/util"
+  autoload :Core, "dynamodb_model/core"
   autoload :Erb, "dynamodb_model/erb"
+  autoload :Log, "dynamodb_model/log"
 
-  extend Util
+  extend Core
 end

data/lib/dynamodb_model/{util.rb → core.rb}

@@ -1,15 +1,25 @@
 require 'logger'
 
-module DynamodbModel::Util
+module DynamodbModel::Core
   # Ensures trailing slash
   # Useful for appending a './' in front of a path or leaving it alone.
   # Returns: '/path/with/trailing/slash/' or './'
   @@app_root = nil
   def app_root
     return @@app_root if @@app_root
-    @@app_root = ENV['JETS_ROOT'].to_s
-    @@app_root = '.' if @@app_root == ''
+    @@app_root = ENV['APP_ROOT'] || ENV['JETS_ROOT'] || ENV['RAILS_ROOT']
+    @@app_root = '.' if @@app_root.nil? || @app_root == ''
     @@app_root = "#{@@app_root}/" unless @@app_root.ends_with?('/')
     @@app_root
   end
+
+  @@logger = nil
+  def logger
+    return @@logger if @@logger
+    @@logger = Logger.new($stderr)
+  end
+
+  def logger=(value)
+    @@logger = value
+  end
 end

data/lib/dynamodb_model/db_config.rb

@@ -74,7 +74,7 @@ module DynamodbModel::DbConfig
         env = ENV['DYNAMODB_MODEL_ENV'] || "development"
       end
 
-      config = YAML.load(erb_result(config_path))
+      config = YAML.load(DynamodbModel::Erb.result(config_path))
       @db_config ||= config[env] || {}
     end
 
@@ -97,38 +97,5 @@ module DynamodbModel::DbConfig
     def set_table_namespace(value)
       @table_namespace = value
     end
-
-    def erb_result(path)
-      template = IO.read(path)
-      begin
-        ERB.new(template, nil, "-").result(binding)
-      rescue Exception => e
-        puts e
-        puts e.backtrace if ENV['DEBUG']
-
-        # how to know where ERB stopped? - https://www.ruby-forum.com/topic/182051
-        # syntax errors have the (erb):xxx info in e.message
-        # undefined variables have (erb):xxx info in e.backtrac
-        error_info = e.message.split("\n").grep(/\(erb\)/)[0]
-        error_info ||= e.backtrace.grep(/\(erb\)/)[0]
-        raise unless error_info # unable to find the (erb):xxx: error line
-        line = error_info.split(':')[1].to_i
-        puts "Error evaluating ERB template on line #{line.to_s.colorize(:red)} of: #{path.sub(/^\.\//, '').colorize(:green)}"
-
-        template_lines = template.split("\n")
-        context = 5 # lines of context
-        top, bottom = [line-context-1, 0].max, line+context-1
-        spacing = template_lines.size.to_s.size
-        template_lines[top..bottom].each_with_index do |line_content, index|
-          line_number = top+index+1
-          if line_number == line
-            printf("%#{spacing}d %s\n".colorize(:red), line_number, line_content)
-          else
-            printf("%#{spacing}d %s\n", line_number, line_content)
-          end
-        end
-        exit 1 unless ENV['TEST']
-      end
-    end
   end
 end

data/lib/dynamodb_model/erb.rb

@@ -7,6 +7,8 @@ require 'erb'
 #   result = DynamodbModel::Erb.result(path, key1: "val1", key2: "val2")
 #
 class DynamodbModel::Erb
+  include DynamodbModel::Log
+
   class << self
     def result(path, variables={})
       set_template_variables(variables)
@@ -14,8 +16,8 @@ class DynamodbModel::Erb
       begin
         ERB.new(template, nil, "-").result(binding)
       rescue Exception => e
-        puts e
-        puts e.backtrace if ENV['DEBUG']
+        log(e)
+        log(e.backtrace) if ENV['DEBUG']
 
         # how to know where ERB stopped? - https://www.ruby-forum.com/topic/182051
         # syntax errors have the (erb):xxx info in e.message
@@ -24,7 +26,7 @@ class DynamodbModel::Erb
         error_info ||= e.backtrace.grep(/\(erb\)/)[0]
         raise unless error_info # unable to find the (erb):xxx: error line
         line = error_info.split(':')[1].to_i
-        puts "Error evaluating ERB template on line #{line.to_s.colorize(:red)} of: #{path.sub(/^\.\//, '').colorize(:green)}"
+        log "Error evaluating ERB template on line #{line.to_s.colorize(:red)} of: #{path.sub(/^\.\//, '').colorize(:green)}"
 
         template_lines = template.split("\n")
         context = 5 # lines of context

data/lib/dynamodb_model/item.rb

@@ -37,6 +37,7 @@ require "yaml"
 #
 module DynamodbModel
   class Item
+    include Log
     include DbConfig
 
     def initialize(attrs={})
@@ -121,7 +122,7 @@ module DynamodbModel
     #
     # AWS Docs examples: http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/GettingStarted.Ruby.04.html
     def self.scan(params={})
-      puts("It's recommended to not use scan for production. It can be slow and expensive. You can a LSI or GSI and query the index instead.")
+      log("It's recommended to not use scan for production. It can be slow and expensive. You can a LSI or GSI and query the index instead.")
       params = { table_name: table_name }.merge(params)
       resp = db.scan(params)
       resp.items.map {|i| self.new(i) }

data/lib/dynamodb_model/log.rb

@@ -0,0 +1,15 @@
+module DynamodbModel::Log
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
+
+  def log(msg)
+    self.class.log(msg)
+  end
+
+  module ClassMethods
+    def log(msg)
+      DynamodbModel.logger.info(msg)
+    end
+  end
+end

data/lib/dynamodb_model/migration/generator.rb

@@ -1,7 +1,7 @@
 require "active_support/core_ext/string"
 
 class DynamodbModel::Migration
-  # jets dynamodb generate posts --partition-key id:string
+  # jets dynamodb:generate posts --partition-key id:string
   class Generator
     include DynamodbModel::DbConfig
 
@@ -21,7 +21,7 @@ class DynamodbModel::Migration
       FileUtils.mkdir_p(File.dirname(migration_path))
       IO.write(migration_path, migration_code)
       puts "Migration file created: #{migration_path}. \nTo run:"
-      puts "  jets dynamodb migrate #{migration_path}"
+      puts "  jets dynamodb:migrate #{migration_path}"
     end
 
     def migration_code

data/lib/dynamodb_model/version.rb

@@ -1,3 +1,3 @@
 module DynamodbModel
-  VERSION = "1.0.3"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamodb_model
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-24 00:00:00.000000000 Z
+date: 2017-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -99,9 +99,11 @@ files:
 - docs/migrations/short-example.rb
 - dynamodb_model.gemspec
 - lib/dynamodb_model.rb
+- lib/dynamodb_model/core.rb
 - lib/dynamodb_model/db_config.rb
 - lib/dynamodb_model/erb.rb
 - lib/dynamodb_model/item.rb
+- lib/dynamodb_model/log.rb
 - lib/dynamodb_model/migration.rb
 - lib/dynamodb_model/migration/common.rb
 - lib/dynamodb_model/migration/dsl.rb
@@ -112,7 +114,6 @@ files:
 - lib/dynamodb_model/migration/generator.rb
 - lib/dynamodb_model/migration/templates/create_table.rb
 - lib/dynamodb_model/migration/templates/update_table.rb
-- lib/dynamodb_model/util.rb
 - lib/dynamodb_model/version.rb
 homepage: https://github.com/tongueroo/dynamodb_model
 licenses: []