xforum 0.0.390 → 0.0.391

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd58f25b4b0f1a795f063aeb5b1c40f8eafd1470
-  data.tar.gz: b66a2c167041cdf6b1445d774cbdcaa7bad2fcde
+  metadata.gz: 9311abced4e42f2afc2f2f216c6d96f5639749b7
+  data.tar.gz: be645eda103a04f47c825fcbeccdc58e948fb645
 SHA512:
-  metadata.gz: 26884d6aaf716adabdb2d115904c297ac660d94acc7a021492bf92b728f0a82b091de0d04f5ebb27df9aa207f4cdd9010c93b63dc18f26a01542329e0b573f54
-  data.tar.gz: 2887157af071e1ec8b8c1fa7b8dcc519ecfa77b76062bf67f6bfb70e62b6433504fbeef0a5781851827178e9d88b48116a168cf6e50de3b57be2a95488f31c7e
+  metadata.gz: 6402dd39de8f02e23722f92bd98a445865d896d2e8a5cdcbb6172a8e58cc74bde5cb9bbe423a35a5778cbfb9dc9c1383593990f0ee7ce104431cfb93d24fc51d
+  data.tar.gz: 4275038cf7fee60292604ea833390011baba163c636642d4ec6df7a59fc69196df2779514019322820825d311160e59a296a3647adeb69ed935684c7e5763fc1

data/lib/xforum.rb

@@ -64,31 +64,39 @@ module Xforum
         alist
       end
 
-      def self.aws_params
-        {server: 's3.amazonaws.com',
-         port: 443,
-         protocol: 'https',
-         no_subdomains: true}
+      def self.get_url(source)
+        my_object=AssistMe.get_aws_object(source)
+        if ENV['USE_AWS']=='true'
+          my_object.url_for(:read, :expires => 60*60).to_param
+        else
+          File.join('http://localhost:3000',source)
+        end
       end
 
-      def self.get_url(source,my_bucket=ENV['XFORUM_S3_BUCKET'])
-        if ENV['XFORUM_USE_S3']=='true'
-          begin
-            s3 = RightAws::S3Interface.new(ENV['XFORUM_S3_ACCESS_KEY_ID'], ENV['XFORUM_S3_SECRET_ACCESS_KEY'], ForumAssist.aws_params)
-            url= s3.get_link(my_bucket, source)
-            temp=url.split(my_bucket)
-            "https://#{my_bucket}.s3.amazonaws.com#{temp[1]}"
-          rescue
-            'no joy'
+      def self.list_files(directory)
+        amazon_s3 = AWS::S3.new(
+            access_key_id:ENV['XFORUM_S3_ACCESS_KEY_ID'],
+            secret_access_key:ENV['XFORUM_S3_SECRET_ACCESS_KEY'])
+        files=[]
+        amazon_s3.buckets[ENV['XFORUM_S3_BUCKET']].objects.each{|object|
+          if object.key.include?("#{directory}/")
+            files.push(object.key)
           end
-        else
-          'no joy'
-        end
+        }
+        files
+      end
+
+      def self.get_aws_object(key,my_bucket=ENV['S3_BUCKET'])
+        amazon_s3 = AWS::S3.new(
+            access_key_id:ENV['XFORUM_S3_ACCESS_KEY_ID'],
+            secret_access_key:ENV['XFORUM_S3_SECRET_ACCESS_KEY'])
+        bucket = amazon_s3.buckets[my_bucket]
+        bucket.objects[key]
       end
 
       def self.save_image(source, key)
-        amazon_s3 = RightAws::S3Interface.new(ENV['XFORUM_S3_ACCESS_KEY_ID'], ENV['XFORUM_S3_SECRET_ACCESS_KEY'], aws_params)
-        amazon_s3.store_object_multipart(bucket: ENV['XFORUM_S3_BUCKET'], key: key, data: File.read(source))
+        my_object=AssistMe.get_aws_object(key)
+        my_object.write(Pathname.new(source))
       end
     end
 end

data/lib/xforum/version.rb

@@ -1,3 +1,3 @@
 module Xforum
-  VERSION = '0.0.390'
+  VERSION = '0.0.391'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xforum
 version: !ruby/object:Gem::Version
-  version: 0.0.390
+  version: 0.0.391
 platform: ruby
 authors:
 - Robert D Blanton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -67,33 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '1.59'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '1.59'
 - !ruby/object:Gem::Dependency
-  name: right_aws
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: jquery-form-rails
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: jquery-turbolinks
   requirement: !ruby/object:Gem::Requirement
@@ -349,3 +349,4 @@ test_files:
 - test/integration/navigation_test.rb
 - test/test_helper.rb
 - test/xforum_test.rb
+has_rdoc: