paperclip-atompub 0.0.3.3 → 0.0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 778470f0c4d745ad3e3eaa780bcab2d3cbe73525
-  data.tar.gz: ad5e1e564b23e24d73c7ffc74a41569b9b8cf7d5
+  metadata.gz: d389b88b87897623ac64620356041236b834b3fa
+  data.tar.gz: 3e94ebf2967d067b7ce24a0f5223b287a3801708
 SHA512:
-  metadata.gz: afc224ca6a4e882709cdcaa92466cb60b7c01299f1c84b7c92a54e2f2f647f760eaeffce728ff2fef660a8ec2c8617f1f4dac2e8082e79fd2c8823338a2ee38a
-  data.tar.gz: b417b711d4f9f366a3fe6233f517c9d592e575da10d1492b84bf69b7043a5c1cb9fa34fd076765dc4db77d8d66fabb9b0f4667ad09320fd8364b516d914b706e
+  metadata.gz: 3adc821eb89371d372bdcec7747576efac089f97531e42c52ea62543f798b3976f45150fac914ae86bc1e33ef0931c1a97aaa4b3bef7cac6394ef8eda2ef22e8
+  data.tar.gz: e32e99dc894a07bcd12adf8321f1d8312fcccc262e1315de9afd707bd7f862b2959bd4f280ecd542b906e667a9a224edf2a76ef4cc1c23adc6dbeebdb84ed8b5

data/MIT-LICENSE

@@ -1,20 +1,20 @@
-Copyright 2012 YOURNAME
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright 2012 YOURNAME
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,44 +1,44 @@
-= Paperclip Atompub Storage
-
-(Atompub Media Resource only.)
-
-== Installation
-
-  gem 'paperclip-atompub', '~> 0.0.1'
-
-  bundle exec rake paperclip_atompub:install:migrations
-  bundle exec rake db:migrate
-
-== Usage
-
-=== Simple
-
-  class User < ActiveRecord::Base
-    attr_accessible :name, :avatar
-    has_attached_file :avatar,
-      :storage => :atompub,
-      :atompub_config => {
-        :service_uri => 'http://atompub.host/atomsvc',
-        :media_collection_uri => 'http://atompub.host/resources'
-      },
-      :atompub_credentials => {
-        :username => 'USERNAME',
-        :password => 'PASSWORD'
-      },
-      :styles => { :medium => "300x300>", :thumb => "100x100>" }
-  end
-
-=== Dynamic Credentials
-
-  :atompub_credentials => lambda { |attachment|
-    user = attachment.instance # => #<User id:1>
-    { :username => user.atompub_username, :password => user.atompub_password }
-  },
-
-== Contributing to paperclip-atompub
-
-Fork, fix, then send me a pull request.
-
-== Copyright
-
-Copyright(c) 2012 Yuichi Takeuchi, released under the MIT license
+= Paperclip Atompub Storage
+
+(Atompub Media Resource only.)
+
+== Installation
+
+  gem 'paperclip-atompub', '~> 0.0.1'
+
+  bundle exec rake paperclip_atompub:install:migrations
+  bundle exec rake db:migrate
+
+== Usage
+
+=== Simple
+
+  class User < ActiveRecord::Base
+    attr_accessible :name, :avatar
+    has_attached_file :avatar,
+      :storage => :atompub,
+      :atompub_config => {
+        :service_uri => 'http://atompub.host/atomsvc',
+        :media_collection_uri => 'http://atompub.host/resources'
+      },
+      :atompub_credentials => {
+        :username => 'USERNAME',
+        :password => 'PASSWORD'
+      },
+      :styles => { :medium => "300x300>", :thumb => "100x100>" }
+  end
+
+=== Dynamic Credentials
+
+  :atompub_credentials => lambda { |attachment|
+    user = attachment.instance # => #<User id:1>
+    { :username => user.atompub_username, :password => user.atompub_password }
+  },
+
+== Contributing to paperclip-atompub
+
+Fork, fix, then send me a pull request.
+
+== Copyright
+
+Copyright(c) 2012 Yuichi Takeuchi, released under the MIT license

data/Rakefile

@@ -1,27 +1,27 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'PaperclipAtompub'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-
-
-
-Bundler::GemHelper.install_tasks
-
+#!/usr/bin/env rake
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
+end
+
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'PaperclipAtompub'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+
+
+
+Bundler::GemHelper.install_tasks
+

data/app/assets/javascripts/paperclip_atompub/application.js

@@ -1,15 +1,15 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
-//
-//= require jquery
-//= require jquery_ujs
-//= require_tree .
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .

data/app/assets/stylesheets/paperclip_atompub/application.css

@@ -1,13 +1,13 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require_tree .
- */
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require_self
+ *= require_tree .
+ */

data/app/controllers/paperclip_atompub/application_controller.rb

@@ -1,4 +1,4 @@
-module PaperclipAtompub
-  class ApplicationController < ActionController::Base
-  end
-end
+module PaperclipAtompub
+  class ApplicationController < ActionController::Base
+  end
+end

data/app/models/paperclip_atompub/attachment.rb

@@ -1,6 +1,6 @@
-module PaperclipAtompub
-  class Attachment < ActiveRecord::Base
-    attr_accessible :attachment_name, :instance_id, :instance_type, :resource_uri, :style
-    belongs_to :instance, :polymorphic => true
-  end
-end
+module PaperclipAtompub
+  class Attachment < ActiveRecord::Base
+    attr_accessible :attachment_name, :instance_id, :instance_type, :resource_uri, :style
+    belongs_to :instance, :polymorphic => true
+  end
+end

data/app/views/layouts/paperclip_atompub/application.html.erb

@@ -1,14 +1,14 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>PaperclipAtompub</title>
-  <%= stylesheet_link_tag    "paperclip_atompub/application", :media => "all" %>
-  <%= javascript_include_tag "paperclip_atompub/application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>
+<!DOCTYPE html>
+<html>
+<head>
+  <title>PaperclipAtompub</title>
+  <%= stylesheet_link_tag    "paperclip_atompub/application", :media => "all" %>
+  <%= javascript_include_tag "paperclip_atompub/application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/config/routes.rb

@@ -1,2 +1,2 @@
-PaperclipAtompub::Engine.routes.draw do
-end
+PaperclipAtompub::Engine.routes.draw do
+end

data/db/migrate/20121108051952_create_paperclip_atompub_attachments.rb

@@ -1,16 +1,16 @@
-class CreatePaperclipAtompubAttachments < ActiveRecord::Migration
-  def change
-    create_table :paperclip_atompub_attachments do |t|
-      t.string :instance_type, :null => false
-      t.integer :instance_id, :null => false
-      t.string :attachment_name, :null => false
-      t.string :style, :null => false
-      t.string :resource_uri, :null => false
-      t.string :content_src, :null => false
-      t.timestamps
-    end
-    add_index :paperclip_atompub_attachments, [:instance_type, :instance_id], :name => 'attachments_on_instance_type_and_instance_id'
-    add_index :paperclip_atompub_attachments, [:instance_type, :instance_id, :attachment_name], :name => 'instance_type_and_instance_id_and_attachment_name'
-    add_index :paperclip_atompub_attachments, [:instance_type, :instance_id, :attachment_name, :style], :unique => true, :name => 'instance_type_and_instance_id_and_attachment_name_and_style'
-  end
-end
+class CreatePaperclipAtompubAttachments < ActiveRecord::Migration
+  def change
+    create_table :paperclip_atompub_attachments do |t|
+      t.string :instance_type, :null => false
+      t.integer :instance_id, :null => false
+      t.string :attachment_name, :null => false
+      t.string :style, :null => false
+      t.string :resource_uri, :null => false
+      t.string :content_src, :null => false
+      t.timestamps
+    end
+    add_index :paperclip_atompub_attachments, [:instance_type, :instance_id], :name => 'attachments_on_instance_type_and_instance_id'
+    add_index :paperclip_atompub_attachments, [:instance_type, :instance_id, :attachment_name], :name => 'instance_type_and_instance_id_and_attachment_name'
+    add_index :paperclip_atompub_attachments, [:instance_type, :instance_id, :attachment_name, :style], :unique => true, :name => 'instance_type_and_instance_id_and_attachment_name_and_style'
+  end
+end

data/lib/paperclip-atompub.rb

@@ -1 +1 @@
-require "paperclip_atompub"
+require "paperclip_atompub"

data/lib/paperclip/storage/atompub.rb

@@ -1,116 +1,116 @@
-require 'atomutil'
-
-module Paperclip
-  module Storage
-    module Atompub
-      def self.extended(base)
-        base.instance_eval do
-          (@options.delete(:atompub_config) || {}).each do |key, value|
-            @options[:"atompub_#{key}"] = value
-          end
-        end
-      end
-
-      def path(style_name = default_style)
-        style_name
-      end
-
-      def url(style_name = default_style)
-        attachment = atompub_attachment(style_name)
-        attachment ? attachment.content_src : nil
-      end
-
-      def exists?(style_name = default_style)
-        if original_filename
-          ! atompub_entry(style_name).nil?
-        else
-          false
-        end
-      end
-      
-      def flush_writes #:nodoc:
-        @queued_for_write.each do |style, file|
-          begin
-            log("saving #{path(style)}")
-            attachment = atompub_attachment(style)
-            attachment.resource_uri = atompub_client.create_media(options[:atompub_media_collection_uri], file.path, file.content_type)
-            attachment.content_src = atompub_client.get_entry(attachment.resource_uri).content.src
-            attachment.save!
-          ensure
-            file.rewind
-          end
-        end
-      end
-
-      def flush_deletes #:nodoc:
-        @queued_for_delete.each do |path|
-          begin
-            log("deleting #{path}")
-            entry = atompub_entry(path)
-            attachment = atompub_attachment(path).destroy
-            attachment.destroy
-            atompub_client.delete_media(entry.edit_media_link)
-          rescue ::Atompub::RequestError
-            # Ignore this.
-          end
-        end
-        @queued_for_delete = []
-      end
-
-      private
-      def atompub_auth
-        @atompub_auth ||= ::Atompub::Auth::Wsse.new(atompub_credentials)
-      end
-
-      def atompub_client
-        @atompub_client ||= begin
-                              client = ::Atompub::Client.new(:auth => atompub_auth)
-                              client.get_service(options[:atompub_service_uri])
-                              client
-                            end
-        
-      end
-
-      def atompub_credentials
-        @atompub_credentials ||= parse_credentials(options[:atompub_credentials]).with_indifferent_access
-      end
-
-      def parse_credentials(creds)
-        creds = creds.respond_to?('call') ? creds.call(self) : creds
-        creds = find_credentials(creds).stringify_keys
-        env = Object.const_defined?(:Rails) ? Rails.env : nil
-        (creds[env] || creds).symbolize_keys
-      end
-
-      def find_credentials(creds)
-        case creds
-        when File
-          YAML::load(ERB.new(File.read(creds.path)).result)
-        when String, Pathname
-          YAML::load(ERB.new(File.read(creds)).result)
-        when Hash
-          creds
-        else
-          raise ArgumentError, "Credentials are not a path, file, proc, or hash."
-        end
-      end
-
-      def atompub_attachment(style_name = default_style)
-        PaperclipAtompub::Attachment.where(:style => style_name,
-                                           :instance_type => self.instance.class.name,
-                                           :instance_id => self.instance.id,
-                                           :attachment_name => self.name).first_or_initialize
-      end
-
-      def atompub_entry(style_name = default_style)
-        entry = atompub_attachment(style_name)
-        return nil if entry.new_record?
-
-        return atompub_client.get_entry(entry.resource_uri)
-      rescue ::Atompub::RequestError
-        return nil
-      end
-
-    end
-  end
-end
+require 'atomutil'
+
+module Paperclip
+  module Storage
+    module Atompub
+      def self.extended(base)
+        base.instance_eval do
+          (@options.delete(:atompub_config) || {}).each do |key, value|
+            @options[:"atompub_#{key}"] = value
+          end
+        end
+      end
+
+      def path(style_name = default_style)
+        style_name
+      end
+
+      def url(style_name = default_style)
+        attachment = atompub_attachment(style_name)
+        attachment ? attachment.content_src : nil
+      end
+
+      def exists?(style_name = default_style)
+        if original_filename
+          ! atompub_entry(style_name).nil?
+        else
+          false
+        end
+      end
+      
+      def flush_writes #:nodoc:
+        @queued_for_write.each do |style, file|
+          begin
+            log("saving #{path(style)}")
+            attachment = atompub_attachment(style)
+            attachment.resource_uri = atompub_client.create_media(options[:atompub_media_collection_uri], file.path, file.content_type, original_filename)
+            attachment.content_src = atompub_client.get_entry(attachment.resource_uri).content.src
+            attachment.save!
+          ensure
+            file.rewind
+          end
+        end
+      end
+
+      def flush_deletes #:nodoc:
+        @queued_for_delete.each do |path|
+          begin
+            log("deleting #{path}")
+            entry = atompub_entry(path)
+            attachment = atompub_attachment(path).destroy
+            attachment.destroy
+            atompub_client.delete_media(entry.edit_media_link)
+          rescue ::Atompub::RequestError
+            # Ignore this.
+          end
+        end
+        @queued_for_delete = []
+      end
+
+      private
+      def atompub_auth
+        @atompub_auth ||= ::Atompub::Auth::Wsse.new(atompub_credentials)
+      end
+
+      def atompub_client
+        @atompub_client ||= begin
+                              client = ::Atompub::Client.new(:auth => atompub_auth)
+                              client.get_service(options[:atompub_service_uri])
+                              client
+                            end
+        
+      end
+
+      def atompub_credentials
+        @atompub_credentials ||= parse_credentials(options[:atompub_credentials]).with_indifferent_access
+      end
+
+      def parse_credentials(creds)
+        creds = creds.respond_to?('call') ? creds.call(self) : creds
+        creds = find_credentials(creds).stringify_keys
+        env = Object.const_defined?(:Rails) ? Rails.env : nil
+        (creds[env] || creds).symbolize_keys
+      end
+
+      def find_credentials(creds)
+        case creds
+        when File
+          YAML::load(ERB.new(File.read(creds.path)).result)
+        when String, Pathname
+          YAML::load(ERB.new(File.read(creds)).result)
+        when Hash
+          creds
+        else
+          raise ArgumentError, "Credentials are not a path, file, proc, or hash."
+        end
+      end
+
+      def atompub_attachment(style_name = default_style)
+        PaperclipAtompub::Attachment.where(:style => style_name,
+                                           :instance_type => self.instance.class.name,
+                                           :instance_id => self.instance.id,
+                                           :attachment_name => self.name).first_or_initialize
+      end
+
+      def atompub_entry(style_name = default_style)
+        entry = atompub_attachment(style_name)
+        return nil if entry.new_record?
+
+        return atompub_client.get_entry(entry.resource_uri)
+      rescue ::Atompub::RequestError
+        return nil
+      end
+
+    end
+  end
+end

data/lib/paperclip_atompub.rb

@@ -1,7 +1,7 @@
-require "paperclip_atompub/engine"
-
-require 'paperclip'
-require 'paperclip/storage/atompub'
-
-module PaperclipAtompub
-end
+require "paperclip_atompub/engine"
+
+require 'paperclip'
+require 'paperclip/storage/atompub'
+
+module PaperclipAtompub
+end

data/lib/paperclip_atompub/engine.rb

@@ -1,5 +1,5 @@
-module PaperclipAtompub
-  class Engine < ::Rails::Engine
-    isolate_namespace PaperclipAtompub
-  end
-end
+module PaperclipAtompub
+  class Engine < ::Rails::Engine
+    isolate_namespace PaperclipAtompub
+  end
+end

data/lib/paperclip_atompub/version.rb

@@ -1,3 +1,3 @@
-module PaperclipAtompub
-  VERSION = "0.0.3.3"
-end
+module PaperclipAtompub
+  VERSION = "0.0.3.4"
+end

data/lib/tasks/paperclip_atompub_tasks.rake

@@ -1,4 +1,4 @@
-# desc "Explaining what the task does"
-# task :paperclip-atompub do
-#   # Task goes here
-# end
+# desc "Explaining what the task does"
+# task :paperclip-atompub do
+#   # Task goes here
+# end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-atompub
 version: !ruby/object:Gem::Version
-  version: 0.0.3.3
+  version: 0.0.3.4
 platform: ruby
 authors:
 - Yuichi Takeuchi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -101,19 +101,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/models/paperclip_atompub/attachment.rb
-- app/controllers/paperclip_atompub/application_controller.rb
-- app/assets/stylesheets/paperclip_atompub/application.css
 - app/assets/javascripts/paperclip_atompub/application.js
+- app/assets/stylesheets/paperclip_atompub/application.css
+- app/controllers/paperclip_atompub/application_controller.rb
+- app/models/paperclip_atompub/attachment.rb
 - app/views/layouts/paperclip_atompub/application.html.erb
 - config/routes.rb
 - db/migrate/20121108051952_create_paperclip_atompub_attachments.rb
+- lib/paperclip/storage/atompub.rb
+- lib/paperclip-atompub.rb
 - lib/paperclip_atompub/engine.rb
 - lib/paperclip_atompub/version.rb
-- lib/paperclip-atompub.rb
-- lib/tasks/paperclip_atompub_tasks.rake
-- lib/paperclip/storage/atompub.rb
 - lib/paperclip_atompub.rb
+- lib/tasks/paperclip_atompub_tasks.rake
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Adds Atompub Media Resource strage support for the Paperclip