minidynamo 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b06b99d8d9966437af6839720b1dab5d9de57dbc
+  data.tar.gz: 6108350ec6d417410f125db2ba8cf9733c24f7ab
+SHA512:
+  metadata.gz: 61c1fc642c72e4249617dbdb922d856fda64ce31d39c6d304f186c7f893a54d5d26ccd3c5aeb861f0d03dc1c17e2f330bd57aa7299434364954eda47c2273eb8
+  data.tar.gz: 33993078342a9bfc9632121ab4484a670a1966217af25145fc8f9ab0ccc6a9f84faefcfbbbc7700d89a968a8615c78a1fd7f7d867d310ae3cbd5d5398d02c94c

data/Gemfile

@@ -1,12 +1,11 @@
 source "http://rubygems.org"
 
-gem "aws-sdk", ">= 1.11.3"
+gem "aws-sdk", "~> 1.2.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
-  gem "rdoc", "~> 3.12"
-  gem "jeweler", "~> 1.8.4"
-  #gem "simplecov", "~> 0.7.1"
+  #gem "shoulda", ">= 0"
+  #gem "rdoc", ">= 0"
+  gem "jeweler", "~> 1.8.7"
 end

data/Gemfile.lock

@@ -1,39 +1,57 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    aws-sdk (1.11.3)
+    addressable (2.3.5)
+    aws-sdk (1.15.0)
       json (~> 1.4)
       nokogiri (< 1.6.0)
       uuidtools (~> 2.1)
-    git (1.2.5)
-    i18n (0.6.1)
-    jeweler (1.8.4)
+    builder (3.2.2)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    git (1.2.6)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    hashie (2.0.5)
+    highline (1.6.19)
+    httpauth (0.2.0)
+    jeweler (1.8.7)
+      builder
       bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
       rdoc
     json (1.8.0)
-    multi_json (1.7.6)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    multi_json (1.7.9)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
     nokogiri (1.5.10)
-    rake (10.0.4)
-    rdoc (3.12.2)
+    oauth2 (0.9.2)
+      faraday (~> 0.8)
+      httpauth (~> 0.2)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.5.2)
+    rake (10.1.0)
+    rdoc (4.0.1)
       json (~> 1.4)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.1.2)
-    shoulda-matchers (2.2.0)
-      activesupport (>= 3.0.0)
     uuidtools (2.1.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aws-sdk (>= 1.11.3)
-  jeweler (~> 1.8.4)
-  rdoc (~> 3.12)
-  shoulda
+  aws-sdk (~> 1.15.0)
+  jeweler (~> 1.8.7)

data/README.md

@@ -81,3 +81,9 @@ You could go and create the table by calling `TestModel.create_table`
 * Commit and push until you are happy with your contribution.
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so we can cherry-pick around it.
+
+
+NOTES
+====
+
+* only number, binary or string are accepted on the table command types

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/minidynamo/model/dynamo_db_overloads.rb

@@ -13,13 +13,13 @@ module Minidynamo
 				# inside the model
 				def create_table
 					create_opts = {}
-					create_opts[:hash_key] = hash_key
-					create_opts[:range_key] = range_key if range_key
+					create_opts[:hash_key] = convert_key_to_dynamo_db_types hash_key
+					create_opts[:range_key] = convert_key_to_dynamo_db_types range_key if range_key
 
-					dynamo_db.tables.create   dynamo_db_table_name,
-					read_capacity,
-					write_capacity,
-					create_opts
+					dynamo_db.tables.create   	dynamo_db_table_name,
+												read_capacity,
+												write_capacity,
+												create_opts
 				end
 
 				# @return [DynamoDB::Table]
@@ -27,8 +27,8 @@ module Minidynamo
 				# @api private
 				def dynamo_db_table shard_name = nil
 					table = dynamo_db.tables[dynamo_db_table_name(shard_name)]
-					table.hash_key = hash_key #[:id, :string]
-					table.range_key = range_key if range_key
+					table.hash_key = convert_key_to_dynamo_db_types(hash_key) #[:id, :string]
+					table.range_key = convert_key_to_dynamo_db_types(range_key) if range_key
 
 					#table.hash_key = {:public_token => :string }
 					#table.range_key = {:created_at => :string }
@@ -38,6 +38,27 @@ module Minidynamo
 					table
 				end
 
+				def convert_key_to_dynamo_db_types key
+					keyname = key.keys[0]
+					type = key[keyname]
+					equivalent_type = nil
+					case type
+					when :float
+						equivalent_type = :number
+					when :integer
+						equivalent_type = :number
+					when :boolean
+						equivalent_type = :number
+					when :binary
+						equivalent_type = :binary
+					else
+						equivalent_type = :string
+					end
+					key = {}
+					key[keyname] = equivalent_type
+					return key
+				end
+
 
 			end
 

data/lib/minidynamo/model/finder_overloads.rb

@@ -8,7 +8,7 @@ module Minidynamo
 
 				data = table.items[id].attributes.to_h
 
-				raise RecordNotFound, "no data found for id: #{id}" if data.empty?
+				raise AWS::Record::RecordNotFound, "no data found for id: #{id}" if data.empty?
 
 				obj = self.new(:shard => table)
 				obj.send(:hydrate, id, data)

data/lib/minidynamo/model/keys.rb

@@ -22,7 +22,7 @@ module Minidynamo
 				end
 				type = key[hk]
 				attribute_creator_method_name = "#{type.to_s}_attr".to_sym
-				puts "hk: CALLING #{attribute_creator_method_name} with #{hk}"
+				#puts "hk: CALLING #{attribute_creator_method_name} with #{hk}"
 				send attribute_creator_method_name, hk 
 			end
 
@@ -31,7 +31,7 @@ module Minidynamo
 				rk = key.keys[0]
 				type = key[rk]
 				attribute_creator_method_name = "#{type.to_s}_attr".to_sym
-				puts "rk: CALLING #{attribute_creator_method_name} with #{rk}"
+				#puts "rk: CALLING #{attribute_creator_method_name} with #{rk}"
 				send attribute_creator_method_name, rk 
 			end
 

data/minidynamo.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "minidynamo"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Pelaez"]
@@ -31,9 +31,7 @@ Gem::Specification.new do |s|
     "lib/minidynamo/model/dynamo_db_overloads.rb",
     "lib/minidynamo/model/finder_overloads.rb",
     "lib/minidynamo/model/keys.rb",
-    "minidynamo-0.1.0.gem",
     "minidynamo.gemspec",
-    "model2.rb",
     "test/helper.rb",
     "test/test_minidynamo.rb"
   ]

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minidynamo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - David Pelaez
@@ -14,39 +13,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.11.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.11.3
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -99,37 +90,32 @@ files:
 - lib/minidynamo/model/dynamo_db_overloads.rb
 - lib/minidynamo/model/finder_overloads.rb
 - lib/minidynamo/model/keys.rb
-- minidynamo-0.1.0.gem
 - minidynamo.gemspec
-- model2.rb
 - test/helper.rb
 - test/test_minidynamo.rb
 homepage: http://github.com/vlipco/minidynamo
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1782624063131978072
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 3
 summary: AWS SDK HashModel extension to support DynamoDB tables with hash-range keys
 test_files: []
+has_rdoc: 

data/model2.rb

@@ -1,199 +0,0 @@
-require 'aws-sdk'
-
-def precede_with_check(x)
-	check_digit = CheckDigit.calculate_check_digit(x)
-	"#{check_digit}#{x}"
-end
-
-
-module Minidynamo
-
-
-	# Wrap some HashModel behaviour and offers minor overrides for readability
-	# and to create tables using ranges.
-	class Model < AWS::Record::HashModel
-
-		class << self
-
-			# For all the fields with defaults
-			attr_writer :write_capacity, :read_capacity
-
-			attr_accessor :range_key
-
-			# Use the client table creator instead of the HashModel inheritance
-			def create_table
-				# TODO verify it's not already created
-
-	          create_opts = {}
-	          create_opts[:hash_key] = hash_key
-	          create_opts[:range_key] = range_key if range_key
-	          
-
-	          dynamo_db.tables.create 	dynamo_db_table_name,
-							            read_capacity,
-							            write_capacity,
-							            create_opts
-
-	        end
-
-	        # Obtain the DynamoDB status of a table
-	        def status
-	        end
-
-	        def count_total
-	        	
-	        	initial_q = dynamo_db.client.scan 	:table_name => dynamo_db_table_name, 
-		        									:count => true
-	        	count = initial_q["Count"]
-	        	if initial_q["LastEvaluatedKey"]
-	        		last = initial_q["LastEvaluatedKey"]
-		        	begin 
-		        		q = dynamo_db.client.scan 	:table_name => dynamo_db_table_name, 
-		        									:count => true,
-		        									:exclusive_start_key => last
-		        		count += q["Count"]
-		        		last = q["LastEvaluatedKey"]
-		        	end while last
-		        end
-		        count
-	        	
-			end
-
-			def ddb_client
-				@client ||= AWS::DynamoDB.new.client
-			end
-
-	        
-
-	        #
-	        # TABLE THROUGHPUT HELPERS
-	        #
-
-	        def initial_througput options = {}
-	        	self.read_capacity = options[:read_capacity]
-	        	self.write_capacity = options[:write_capacity]
-	        end
-
-	        def read_capacity
-				@read_capacity || 10
-	        end
-
-	        def write_capacity
-	        	@write_capacity || 10
-	        end
-
-	        def hash_key
-	        	@hash_key || {:id => :string}
-	        end
-
-	        def table options = {}
-	        	set_shard_name options[:name]
-	        	self.hash_key = options[:hash_key] unless options[:hash_key].nil?
-	        	self.range_key = options[:range_key] unless options[:range_key].nil?
-	        end
-
-	        #
-	        # TABLE STRUCTURE HELPERS
-	        #
-
-	        def field key, type, options = {}
-	        	method_name = "#{type.to_s}_attr".to_sym
-	        	puts "CALLING #{method_name}"
-	        	send method_name, key, options
-	        end
-
-	        def hash_key=(key)
-	        	@hash_key = key
-	        	hk = key.keys[0]
-	        	finder_method_name = "find_by_#{hk}".to_sym	        	
-				self.define_singleton_method finder_method_name do |x|
-					find_by_id x
-				end
-				type = key[hk]
-				attribute_creator_method_name = "#{type.to_s}_attr".to_sym
-				puts "CREATING HASH KEY ATTR #{attribute_creator_method_name}"
-				send attribute_creator_method_name, hk
-			end
-
-	        # OVERLOAD THE FINDER TO USE CUSTOM HASK KEYS IN ERRORS
-
-	        alias_method :_find_by_id, :find_by_id
-	        alias_method :_find, :find
-
-#data = table.items[id].attributes.to_h
-#
-#raise RecordNotFound, "no data found for id: #{id}" if data.empty?
-#
-#obj = self.new(:shard => table)
-#obj.send(:hydrate, id, data)
-#obj
-#
-#.query :table_name => "sample-table", :consistent_read => true, :hash_key_value => {:s => "123"} 
-
-	        def find *args
-	        	# If find(id), determine wether a query or regular find will work
-	        	# convert the first argument to integer, if it's a string it'll yield 0
-	        	
-	        	# if the first argument is an integer and this is a table with range as main key
-	        	if args.length == 1 && !args[0].is_a?(Symbol) && hash_range_table?
-	        		items = rangeless_query args[0]
-	        		case items.length
-	        		when 0
-	        			raise AWS::Record::RecordNotFound, "no data found for #{hash_key.keys[0]}: #{args[0]}"  
-	        		when 1
-	        			return items[0]
-	        		else
-	        			return items
-	        		end
-          		end
-
-          		#in any other case fall back to the default HashModel
-          		new_scope.find(*args)
-        	end
-
-        	# converts string > s, numeric > n
-        	def hash_key_type
-	        	dynamo_db_table.hash_key.type.to_s.chars.first.to_sym
-        	end
-
-        	def rangeless_query(*args)
-        		# Map to string if that's the case. For any other type of hash_key
-        		# you will have to provide the converted value or errors might appear
-        		hash_key_type == :s ? hkv = args[0].to_s : hkv = args[0]
-        		result = dynamo_db.client.query :table_name => dynamo_db_table_name, 
-        								:consistent_read => true, 
-        								:hash_key_value => {hash_key_type => hkv} 
-
-        		# Convert the result to items
-        		hashed_items = result["Items"]
-        		items = []
-        		hashed_items.each do |i|
-        			i_data = {}
-        			i.each do |k,v|
-        				# Obtain the first key for the hash describing the value of a DDB column
-        				k_data_type = i[k].keys[0]
-	        			i_data[k] = i[k][k_data_type]
-	        		end
-	        		pt = PublicToken.new
-	        		pt.send :hydrate, i_data["id"], i_data
-	        		items << pt
-	        	end
-        		items
-        	end
-
-        	def hash_range_table?
-        		! hash_key.nil?
-        	end
-
-	        def find_by_id *args
-	        	begin
-	        		hash_range_table? ? rangeless_query(args) : _find_by_id(args)
-					
-				rescue AWS::Record::RecordNotFound
-					raise AWS::Record::RecordNotFound, "no data found for #{hash_key}: #{id}" 
-				end
-	        end
-
-	    end
-	end
-end