relishable 0.35 → 0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bf410339f64a0e2526441a2717017414062e45d
-  data.tar.gz: f7f11bf1ac673c8a73de78967a1152c86c358ab1
+  metadata.gz: 46c6330cb5ff0a4a0c359c97b0e94fbde91fc63d
+  data.tar.gz: e56e3e5febebdd0a9263c175dbc159d0b6194733
 SHA512:
-  metadata.gz: 9a3dd84d20f1bed8e335ddf3999569dc005e7a8a05ba015d6b28f51326ee5431a7aa53589c753889e867f457a8feac0e620181bf508f7d97dff406916571f310
-  data.tar.gz: c0e8e81b5bf9b9555c75640db400b5888e768cbbabaa4af24cae118b69cd1a9d180428a6f33a1266cdfec418235433389634e297a4743c8d13eeb5c40510fc19
+  metadata.gz: 06996c432afb22924a1e3f49735e622a10ed7cf6cb4c171a178797244ded17ea10a67012bf7d500c4e341b4c5be8b1fdbf9dfabb3f0c2b2a998b29b34b8c0b7d
+  data.tar.gz: e57e0635478e91f0fe506e1934e2e234b5d663312f277b53fb3775cf96a39e925cbfe8eb12012059e6bc028604a2ca3a6837ff38ce734b5f81b9e0331b2d4a55

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    relishable (0.35)
-      fog (~> 1.23.0)
+    relishable (0.36)
+      fog-aws (~> 0.8.0)
       legacy-fernet (~> 1.6.3)
+      net-ssh (~> 3.0.2)
 
 GEM
   remote: http://rubygems.org/
@@ -14,38 +15,30 @@ GEM
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
     excon (0.45.4)
-    fog (1.23.0)
-      fog-brightbox
-      fog-core (~> 1.23)
-      fog-json
-      fog-softlayer
-      ipaddress (~> 0.5)
-      nokogiri (~> 1.5, >= 1.5.11)
-    fog-brightbox (0.9.0)
-      fog-core (~> 1.22)
-      fog-json
-      inflecto (~> 0.0.2)
-    fog-core (1.33.0)
+    fog-aws (0.8.0)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-core (1.35.0)
       builder
       excon (~> 0.45)
       formatador (~> 0.2)
-      mime-types
     fog-json (1.0.2)
       fog-core (~> 1.0)
       multi_json (~> 1.10)
-    fog-softlayer (1.0.2)
+    fog-xml (0.1.2)
       fog-core
-      fog-json
+      nokogiri (~> 1.5, >= 1.5.11)
     formatador (0.2.5)
-    inflecto (0.0.2)
-    ipaddress (0.8.0)
+    ipaddress (0.8.2)
     legacy-fernet (1.6.3)
       multi_json
-    mime-types (2.6.2)
-    mini_portile (0.6.2)
+    mini_portile2 (2.0.0)
     multi_json (1.11.2)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    net-ssh (3.0.2)
+    nokogiri (1.6.7.1)
+      mini_portile2 (~> 2.0.0.rc2)
     power_assert (0.2.2)
     rake (10.4.2)
     rspec (3.1.0)

data/lib/relish.rb

@@ -26,7 +26,7 @@ class Relish
 
   def create(id, data)
     rescue_dynamodb_error do
-      item = @db.query_current_version(id)
+      item = @db.query_latest_version(id)
       Release.new.tap do |release|
         if item.nil?
           release.item = {}
@@ -76,7 +76,7 @@ class Relish
       end
     end
   end
-    
+
   def update(id, version, data)
     rescue_dynamodb_error do
       item = @db.get_version(id, version)

data/lib/relish/dynamo_helper.rb

@@ -1,4 +1,4 @@
-require "fog"
+require "fog/aws"
 
 class Relish
   class DynamoHelper
@@ -15,8 +15,34 @@ class Relish
     end
 
     def query_current_version(id, *attrs)
-      response = db.query(@table_name, {:S => id}, :ConsistentRead => true, :Limit => 1, :ScanIndexForward => false)
-      if response.body['Count'] == 1
+      response = db.query(@table_name,
+                          :KeyConditionExpression => 'id = :id AND version > :version',
+                          :FilterExpression => 'draft <> :isDraft',
+                          :ExpressionAttributeValues => {
+                            ':id' => {:S => id},
+                            ':version' => {:N => '0'},
+                            ':isDraft' => {:BOOL => true}
+                          },
+                          :ConsistentRead => true,
+                          :ScanIndexForward => false)
+      count = response.body['Count'] || 0
+      if count > 0
+        response.body['Items'].first
+      end
+    end
+
+    def query_latest_version(id, *attrs)
+      response = db.query(@table_name,
+                          :KeyConditionExpression => 'id = :id AND version > :version',
+                          :ExpressionAttributeValues => {
+                            ':id' => {:S => id},
+                            ':version' => {:N => '0'},
+                          },
+                          :Limit => 1,
+                          :ConsistentRead => true,
+                          :ScanIndexForward => false)
+      count = response.body['Count'] || 0
+      if count > 0
         response.body['Items'].first
       end
     end
@@ -26,16 +52,21 @@ class Relish
     end
 
     def get_version(id, version, *attrs)
-      response = db.get_item(@table_name, {:HashKeyElement => {:S => id}, :RangeKeyElement => {:N => version}}, :ConsistentRead => true)
+      response = db.get_item(@table_name, {:id => {:S => id}, :version => {:N => version}}, :ConsistentRead => true)
       response.body['Item']
     end
 
     def delete_version(id, version)
-      db.delete_item(@table_name, {:HashKeyElement => {:S => id}, :RangeKeyElement => {:N => version}})
+      db.delete_item(@table_name, id: {:S => id}, :version => {:N => version})
     end
 
     def put_version(id, version, item)
-      db.put_item(@table_name, item, {:Expected => {:id => {:Value => {:S => id}}, :version => {:Value => {:N => version}}}})
+      db.put_item(@table_name, item,
+                  :ConditionExpression => 'id <> :id AND version <> :version',
+                  :ExpressionAttributeValues => {
+                    ':id' => {:S => id},
+                    ':version' => {:N => version}
+                  })
     end
 
     def put(item)
@@ -43,7 +74,15 @@ class Relish
     end
 
     def query(id, consistent, limit)
-      response = db.query(@table_name, {:S => id}, :ConsistentRead => consistent, :Limit => limit, :ScanIndexForward => false)
+      response = db.query(@table_name,
+                          :KeyConditionExpression => 'id = :id AND version > :version',
+                          :ExpressionAttributeValues => {
+                            ':id' => {:S => id},
+                            ':version' => {:N => '0'}
+                          },
+                          :ConsistentRead => consistent,
+                          :Limit => limit,
+                          :ScanIndexForward => false)
       response.body['Items']
     end
 

data/lib/relish/release.rb

@@ -14,6 +14,7 @@ class Relish
            :version              => :N,
            :name                 => :S,
            :descr                => :S,
+           :draft                => :BOOL,
            :user_id              => :N,
            :route_id             => :S,
            :slug_uuid            => :S,

data/lib/relish/s3_helper.rb

@@ -1,4 +1,4 @@
-require "fog"
+require "fog/aws"
 
 class Relish
   class S3Helper

data/lib/relish/version.rb

@@ -1,5 +1,5 @@
 class Relish
-  VERSION = "0.35"
+  VERSION = "0.36"
 end
 
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relishable
 version: !ruby/object:Gem::Version
-  version: '0.35'
+  version: '0.36'
 platform: ruby
 authors:
 - Mark Fine
@@ -11,22 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: legacy-fernet
   requirement: !ruby/object:Gem::Requirement
@@ -41,6 +41,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.3
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -139,3 +153,4 @@ signing_key:
 specification_version: 4
 summary: releases
 test_files: []
+has_rdoc: