relishable 0.2 → 0.3

data/lib/relish.rb

@@ -1,26 +1,150 @@
 require "press"
-require "relish/release"
+require "fog"
 
-module Relish
+class Relish
   extend Press
 
+  attr_accessor :items
+
+  def self.conf(*attrs)
+    attrs.each do |attr|
+      instance_eval "def #{attr}; @#{attr} ||= ENV['#{attr.upcase}'] || raise('missing configuration: #{attr.upcase}') end", __FILE__, __LINE__
+    end
+  end
+
+  conf :relish_aws_access_key,
+       :relish_aws_secret_key,
+       :relish_table_name
+
+  def self.schema(attrs)
+    attrs.each do |attr, type|
+      class_eval "def #{attr}; @items['#{attr}']['#{type}'] if @items.key? '#{attr}' end", __FILE__, __LINE__
+      class_eval "def #{attr}= value; @items['#{attr}'] = {'#{type}' => value} end", __FILE__, __LINE__
+    end
+  end
+
+  schema id:             :S,
+         version:        :N,
+         descr:          :S,
+         user_id:        :N,
+         slug_id:        :S,
+         slug_version:   :N,
+         stack:          :S,
+         language_pack:  :S,
+         env_json:       :S,
+         pstable_json:   :S,
+         addons_json:    :S
+
+  def self.db
+    @db ||= Fog::AWS::DynamoDB.new(aws_access_key_id: relish_aws_access_key, aws_secret_access_key: relish_aws_secret_key)
+  end
+
+  def self.db_query_current_version(id)
+    response = db.query(relish_table_name, {S: id}, ConsistentRead: true, Limit: 1, ScanIndexForward: false)
+    if response.status != 200
+      raise('status: #{response.status}')
+    end
+    if response.body['Count'] == 1
+      response.body['Items'].first
+    end
+  end
+
+  def self.db_put_current_version(items)
+    response = db.put_item(relish_table_name, items, {Expected: {id: {Exists: false}, version: {Exists: false}}})
+    if response.status != 200
+      raise('status: #{response.status}')
+    end
+  end
+
+  def self.db_get_version(id, version)
+    response = db.get_item(relish_table_name, {HashKeyElement: {S: id}, RangeKeyElement: {N: version}})
+    if response.status != 200
+      raise('status: #{response.status}')
+    end
+    response.body['Item']
+  end
+
+  def self.db_put_version(id, version, items)
+    response = db.put_item(relish_table_name, items, {Expected: {id: {Value: {S: id}}, version: {Value: {N: version}}}})
+    if response.status != 200
+      raise('status: #{response.status}')
+    end
+  end
+
+  def self.db_put(items)
+    response = db.put_item(relish_table_name, items)
+    if response.status != 200
+      raise('status: #{response.status}')
+    end
+  end
+
+  def self.copy(id, version, data)
+    pdfm __FILE__, __method__, id: id, version: version
+    release = new
+    release.items = {}
+    release.id = id
+    release.version = version
+    data.each do |k, v|
+      release.send("#{k}=", v)
+    end
+    db_put(release.items)
+    release
+  end
+
   def self.create(id, data)
     pdfm __FILE__, __method__, id: id
-    Release.create(id, data)
+    items = db_query_current_version(id)
+    release = new
+    if items.nil?
+      release.items = {}
+      release.id = id
+      release.version = "1"
+    else
+      release.items = items
+      release.version = (release.version.to_i + 1).to_s
+    end
+    data.each do |k, v|
+      release.send("#{k}=", v)
+    end
+    db_put_current_version(release.items)
+    release
+  end
+
+  def self.current(id)
+    pdfm __FILE__, __method__, id: id
+    items = db_query_current_version(id)
+    unless items.nil?
+      release = new
+      release.items = items
+      release
+    end
   end
 
   def self.read(id, version)
     pdfm __FILE__, __method__, id: id, version: version
-    Release.read(id, version)
+    items = db_get_version(id, version)
+    unless items.nil?
+      release = new
+      release.items = items
+      release
+    end
   end
 
-  def self.readall(id)
+  def self.dump(id)
     pdfm __FILE__, __method__, id: id
-    Release.readall(id)
   end
 
   def self.update(id, version, data)
     pdfm __FILE__, __method__, id: id, version: version
-    Release.update(id, version, data)
+    items = db_get_version(id, version)
+    unless items.nil?
+      release = new
+      release.items = items
+      data.each do |k, v|
+        release.send("#{k}=", v)
+      end
+      db_put_version(id, version, release.items)
+      release
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relishable
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -49,7 +49,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/relish/release.rb
 - lib/relish.rb
 - Gemfile
 - Gemfile.lock

data/lib/relish/release.rb

@@ -1,122 +0,0 @@
-require "press"
-require "fog"
-
-module Relish
-  class Release
-    extend Press
-
-    attr_accessor :items
-
-    def self.conf(*attrs)
-      attrs.each do |attr|
-        instance_eval "def #{attr}; @#{attr} ||= ENV['#{attr.upcase}'] || raise('missing configuration: #{attr.upcase}') end", __FILE__, __LINE__
-      end
-    end
-
-    conf :relish_aws_access_key,
-         :relish_aws_secret_key,
-         :relish_table_name
-
-    def self.schema(attrs)
-      attrs.each do |attr, type|
-        class_eval "def #{attr}; @items['#{attr}']['#{type}'] if @items.key? '#{attr}' end", __FILE__, __LINE__
-        class_eval "def #{attr}= value; @items['#{attr}'] = {'#{type}' => value} end", __FILE__, __LINE__
-      end
-    end
-
-    schema id:             :S,
-           version:        :N,
-           descr:          :S,
-           user_id:        :N,
-           slug_id:        :S,
-           slug_version:   :N,
-           stack:          :S,
-           language_pack:  :S,
-           env_json:       :S,
-           pstable_json:   :S,
-           addons_json:    :S
-
-    def self.db
-      @db ||= Fog::AWS::DynamoDB.new(aws_access_key_id: relish_aws_access_key, aws_secret_access_key: relish_aws_secret_key)
-    end
-
-    def self.query_current_version(id)
-      response = db.query(relish_table_name, {S: id}, ConsistentRead: true, Limit: 1, ScanIndexForward: false)
-      if response.status != 200
-        raise('status: #{response.status}')
-      end
-      if response.body['Count'] == 1
-        response.body['Items'].first
-      end
-    end
-
-    def self.put_current_version(items)
-      response = db.put_item(relish_table_name, items, {Expected: {id: {Exists: false}, version: {Exists: false}}})
-      if response.status != 200
-        raise('status: #{response.status}')
-      end
-    end
-
-    def self.get_version(id, version)
-      response = db.get_item(relish_table_name, {HashKeyElement: {S: id}, RangeKeyElement: {N: version}})
-      if response.status != 200
-         raise('status: #{response.status}')
-      end
-      response.body['Item']
-    end
-
-    def self.put_version(id, version, items)
-      response = db.put_item(relish_table_name, items, {Expected: {id: {Value: {S: id}}, version: {Value: {N: version}}}})
-      if response.status != 200
-         raise('status: #{response.status}')
-      end
-    end
-
-    def self.create(id, data)
-      pdfm __FILE__, __method__, id: id
-      items = query_current_version(id)
-      release = new
-      if items.nil?
-        release.items = {}
-        release.id = id
-        release.version = "1"
-      else
-        release.items = items
-        release.version = (release.version.to_i + 1).to_s
-      end
-      data.each do |k, v|
-        release.send("#{k}=", v)
-      end
-      put_current_version(release.items)
-      release
-    end
-
-    def self.read(id, version)
-      pdfm __FILE__, __method__, id: id, version: version
-      items = get_version(id, version)
-      unless items.nil?
-        release = new
-        release.items = items
-        release
-      end
-    end
-
-    def self.readall(id)
-      pdfm __FILE__, __method__, id: id
-    end
-
-    def self.update(id, version, data)
-      pdfm __FILE__, __method__, id: id, version: version
-      items = get_version(id, version)
-      unless items.nil?
-        release = new
-        release.items = items
-        data.each do |k, v|
-          release.send("#{k}=", v)
-        end
-        put_version(id, version, release.items)
-        release
-      end
-    end
-  end
-end