photofy 0.3.5 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52ab5edb906bec6b8f3d9dc4d6382740671ca69b
-  data.tar.gz: a5f6b32dbdc932e35084c5f3f367b6da561c37a1
+  metadata.gz: 2add7237edac4155ae0a095859ac13b60d568a89
+  data.tar.gz: ad0bc7cee2ed54ee24dfb7dc86f1e9180fe7cb38
 SHA512:
-  metadata.gz: c86f938112502f3f6bf340fea7c36eaf915ca5a530a65ff05509f8dbaa2290cf51418c7705086dbc9be74b8449cccbf816479fd6d6ad2eac7c9e74908174ed4d
-  data.tar.gz: fe44b3c6a2f6a6af4dc35a469d0ff0fd3eaa7c68bad31a2b3350028f9f40ed80fce866714a8502a09963ce4a5cc2fa7b1c93b5f0713835190366cffad225b9dc
+  metadata.gz: 13ebe95eea938e86e0d46e35f9b51ece44de02d52bd5cf5e5628a1671840c65d9dac95738f409e518c9ac0774031a4653eb2b8bf23b871c7d42ca155b48bfca9
+  data.tar.gz: 26f7fdadf2ae7dff282989fb5daa2a00832430f0701d75f927f445a348bc7032592571b22a16dce46cb2e4125d2ca4a64acfca59a25be4c4f5dcecf24ee644f2

data/README.md

@@ -39,6 +39,3 @@ Add photo field(s) to model by adding lines like
 `after_photofy :collage, :post_card, Proc.new { |img| img.scale(450, 200) }`
 > Creates 'post_card' photo field by taking source from 'collage' and scaling it to 450x200px.
 
-Enables aws s3 as backend storage (may be in initializer).
-
-`ActiveRecord::Base.photofy_s3_storage({access_key_id: 'xxxxxxxx',secret_access_key: 'xxxxxxxx'}, {bucket: 'test_bucket'})`

data/lib/photofy.rb

@@ -1,4 +1,4 @@
-require 'photofy/s3methods'
+require 'photofy/dummy_s3methods'
 require 'photofy/core'
 require 'tempfile'
 begin
@@ -9,7 +9,7 @@ end
 
 module Photofy
   def self.included(base)
-    base.extend(S3Methods)
+    base.extend(DummyS3Methods)
     base.extend(Core)
   end
 end

data/lib/photofy/dummy_s3methods.rb

@@ -0,0 +1,19 @@
+module Photofy
+
+  module DummyS3Methods
+    def self.extended(base)
+      base.send(:include, InstanceMethods)
+    end
+
+    module InstanceMethods
+      def s3_connected?
+        self.class.s3_connected?
+      end
+    end
+
+    def s3_connected?
+      false
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: photofy
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.1
 platform: ruby
 authors:
 - Praveen Kumar Sinha
@@ -10,30 +10,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: aws-sdk
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.49'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.49.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.49'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.49.0
+date: 2015-03-26 00:00:00.000000000 Z
+dependencies: []
 description: |2
-      A gem to provide simple method to do file upload of pictures and provides getter setter methods of it and save on model object commit.
+      A simple gem to add accessors on rails models for file upload of pictures/assets (which will be persisted on remote media's disk on object save).
       Refer documentation for more help.
 email: praveen.kumar.sinha@gmail.com
 executables: []
@@ -43,7 +23,7 @@ files:
 - README.md
 - lib/photofy.rb
 - lib/photofy/core.rb
-- lib/photofy/s3methods.rb
+- lib/photofy/dummy_s3methods.rb
 homepage: http://praveenkumarsinha.github.io/Photofy
 licenses:
 - MIT
@@ -65,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Photofy

data/lib/photofy/s3methods.rb

@@ -1,85 +0,0 @@
-require 'singleton'
-require 'aws-sdk'
-
-module Photofy
-
-  class S3Setting
-    include Singleton
-
-    attr_accessor :s3_setup
-    attr_accessor :s3_bucket
-  end
-
-  module S3Methods
-    def self.extended(base)
-      base.send(:include, InstanceMethods)
-    end
-
-    module InstanceMethods
-      def s3_connected?
-        self.class.s3_connected?
-      end
-
-      def s3_bucket
-        S3Setting.instance.s3_bucket
-      end
-    end
-
-    def s3_connected?
-      (S3Setting.instance.s3_bucket.class == AWS::S3::Bucket)
-    end
-
-    #Enables aws s3 as backend storage.
-    #Takes two arguments:
-    #1. aws_settings. Hash with access_key_id and secret_access_key from aws s3
-    #2. instance_settings. Hash with bucket as valid aws s3 bucket to be
-    #
-    #Example usage:
-    #photofy_s3_storage({access_key_id: 'xxxxxxxx',secret_access_key: 'xxxxxxxx'}, {bucket: 'test_bucket'})
-    def photofy_s3_storage(aws_settings = {}, instance_settings = {})
-      instance_settings[:bucket] ||= 'photofy'
-      (S3Setting.instance.s3_setup ||= {}).merge!(aws_settings: aws_settings, instance_settings: instance_settings)
-
-      try_connect
-    end
-
-    def try_connect
-      if try_accessing_existing_awsconfig
-        setup_bucket
-      else
-        begin
-          AWS.config(S3Setting.instance.s3_setup[:aws_settings])
-          setup_bucket
-        rescue AWS::Errors::MissingCredentialsError => e
-          puts 'Photofy:S3: AWS credentials not provided.'
-          puts e.message
-        rescue AWS::S3::Errors::SignatureDoesNotMatch => e
-          puts 'Photofy:S3: AWS credentials is most probably not correct.'
-          puts e.message
-        end
-      end
-    end
-
-    def setup_bucket
-      s3 = AWS::S3.new
-      _bucket_name = S3Setting.instance.s3_setup[:instance_settings][:bucket]
-      S3Setting.instance.s3_bucket = if s3.buckets.collect { |x| x.name }.include?(_bucket_name)
-                                       s3.buckets[_bucket_name]
-                                     else
-                                       s3.buckets.create(_bucket_name)
-                                     end
-      S3Setting.instance.s3_bucket
-    end
-
-    def try_accessing_existing_awsconfig
-      begin
-        setup_bucket
-      rescue AWS::Errors::MissingCredentialsError => e
-        puts 'Photofy:S3: No existing aws config found.'
-        return false
-      end
-      true
-    end
-
-  end
-end