chromembed_rails 0.1.2 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/chromembed_rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chromembed_rails}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Victor Costan}]
-  s.date = %q{2011-07-01}
+  s.date = %q{2011-07-06}
   s.description = %q{Ruby on Rails engine for Web applications that are strongly coupled with Chrome extensions}
   s.email = %q{costan@gmail.com}
   s.extra_rdoc_files = [
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/pwnall/chromembed_rails}
   s.licenses = [%q{MIT}]
   s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.4}
+  s.rubygems_version = %q{1.8.5}
   s.summary = %q{Serves a Chrome extension embedded in a Rails application}
 
   if s.respond_to? :specification_version then

data/lib/chromembed_rails/controller.rb

@@ -4,29 +4,11 @@ require 'crxmake'
 # :nodoc: namespace
 module ChromembedRails
 
-# :nodoc: namespace
-module Session
-
-# Mixed into ActiveController::Base
-module ControllerMixin
-  def self.included(base)
-    base.send :extend, ControllerClassMethods
-  end
-end
-
-# Methods here become ActiveController::Base class methods.
-module ControllerClassMethods  
-  # Turns the current controller into the Chrome extension serving controller.
-  #
-  # Right now, this should be called from ChromeExtensionController. The
-  # controller name is hardwired in other parts of the implementation.
-  def chrome_extension_controller
-    include ControllerInstanceMethods
-  end
-end
-
-# Included in controllers that call config_vars_controller.
-module ControllerInstanceMethods
+# Included in the Chrome extension serving controller.
+#
+# Some parts of the codebase assume that the controller's name is
+# ChromeExtension.
+module Controller
   # GET /chrome_extension.crx
   def show
     extension_data =
@@ -48,16 +30,12 @@ module ControllerInstanceMethods
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
   <app appid='#{extension_data.appid}'>
-    <updatecheck codebase='#{chrome_extension_url}' version='#{extension_data.version}' />
+    <updatecheck codebase='#{url_for(:action => :show)}' version='#{extension_data.version}' />
   </app>
 </gupdate>
 END_XML
   end
   private :update_xml
-end  # module ChromembedRails::Session::ControllerInstanceMethods
-
-ActionController::Base.send :include, ControllerMixin
-
-end  # namespace ChromembedRails::Session
+end  # module ChromembedRails::Controller
 
 end  # namespace ChromembedRails

data/lib/chromembed_rails/generators/templates/chrome_extension_cache.rb

@@ -1,6 +1,6 @@
 # Caches information about serving the Chrome extension.
 class ChromeExtensionCache < ActiveRecord::Base
-  chrome_extension_cache_model
+  include ChromembedRails::Model
 
   # Add your extensions to the ChromeExtensionCache model here.
 end

data/lib/chromembed_rails/generators/templates/chrome_extension_controller.rb

@@ -1,6 +1,6 @@
 # Serves the embedded Chrome extension.
 class ChromeExtensionController < ApplicationController
-  chrome_extension_controller
+  include ChromembedRails::Controller
 
   # Add your extension to the controller here.
 end

data/lib/chromembed_rails/model.rb

@@ -1,26 +1,15 @@
 require 'English'
 
-require 'active_record'
+require 'active_support'
 
 # :nodoc: namespace
 module ChromembedRails
 
-# :nodoc: namespace
+# Included by the model caching data for serving an embedded Chrome extension.
 module Model
+  extend ActiveSupport::Concern
 
-
-# Mixed into ActiveRecord::Base
-module ModelMixin
-  def self.included(base)
-    base.send :extend, ModelClassMethods
-  end
-end
-
-
-# Methods here become ActiveRecord::Base class methods.
-module ModelClassMethods
-  # Extends the model to cache data for serving an embedded Chrome extension.
-  def chrome_extension_cache_model
+  included do
     # The extension's appid.
     validates :appid, :uniqueness => true, :length => 1..128, :presence => true
   
@@ -30,66 +19,59 @@ module ModelClassMethods
     # The CRX file contents.
     validates :crx_bits,
               :length => { :in => 0..(64.megabytes), :allow_nil => false }
-
-    extend ModelMetaclassMethods
-    include ModelInstanceMethods
   end
-end  # module ChromembedRails::Model::ModelClassMethods
-
-
-# Included in the metaclass of models that call chrome_extension_cache_model.
-module ModelMetaclassMethods
-  # ChromeExtensionCache entry for the latest extension bits.
-  def extension_data(chrome_extension_update_url)
-    self.new.update_with_current_bits(
-        'update_url' => chrome_extension_update_url)
-  end
-end  # module ChromembedRails::Model::ModelMetaclassMethods
-
-
-# Included in models that call chrome_extension_cache_model.
-module ModelInstanceMethods
-  # Updates this cache entry to reflect the current extension code.
-  #
-  # Args:
-  #   manifest_changes:: hash to be merged into the extension's manifest JSON;
-  #                      'update_url' and 'version' might be good keys to change
-  def update_with_current_bits(manifest_changes)
-    extension_path = ChromembedRails.extension_path
-    manifest_path = File.join extension_path, 'manifest.json'
-    manifest_json = ActiveSupport::JSON.decode File.read(manifest_path)
-    manifest_json.merge! manifest_changes
-    self.version = manifest_json['version']
-
-    key_path = ChromembedRails.key_path
-    key = OpenSSL::PKey::RSA.new File.read(key_path)
-    # Source: http://supercollider.dk/2010/01/calculating-chrome-extension-id-from-your-private-key-233
-    alg = ["30819F300D06092A864886F70D010101050003818D00"].pack('H*')
-    hash = Digest::SHA256.hexdigest(alg + key.public_key.to_der)[0...32]
-    self.appid = hash.unpack('C*').map{ |c| c < 97 ? c + 49 : c + 10 }.
-                      pack('C*')
-    
-    tmp_path = Rails.root.join 'tmp', "chrome_ext_#{Time.now.to_f}_#{$PID}"
-    ext_path = File.join tmp_path, 'chrome_extension'
-    FileUtils.mkdir_p ext_path
-    FileUtils.cp_r File.join(extension_path, '.'), ext_path
-    man_path = File.join ext_path, 'manifest.json'
-    File.open(man_path, 'wb') do |f|
-      f.write ActiveSupport::JSON.encode manifest_json
+  
+  # Class methods for models that include ChromembedRails::Model.
+  module ClassMethods
+    # ChromeExtensionCache entry for the latest extension bits.
+    def extension_data(chrome_extension_update_url)
+      self.new.update_with_current_bits(
+          'update_url' => chrome_extension_update_url)
     end
-    
-    crx_path = File.join tmp_path, 'chrome_extension.crx'
-    CrxMake.make :ex_dir => ext_path, :pkey => key_path,
-                 :crx_output => crx_path, :verbose => false
-    self.crx_bits = File.read crx_path
-    FileUtils.rm_r tmp_path
-    
-    self
-  end
-end  # module ChromembedRails::Model::ModelInstanceMethods
-
-ActiveRecord::Base.send :include, ModelMixin
+  end  # module ChromembedRails::Model::ClassMethods
+
+
+  # Included in models that include ChromembedRails::Model.
+  module InstanceMethods
+    # Updates this cache entry to reflect the current extension code.
+    #
+    # Args:
+    #   manifest_changes:: hash to be merged into the extension's manifest JSON;
+    #                      'update_url' and 'version' might be good keys to change
+    def update_with_current_bits(manifest_changes)
+      extension_path = ChromembedRails.extension_path
+      manifest_path = File.join extension_path, 'manifest.json'
+      manifest_json = ActiveSupport::JSON.decode File.read(manifest_path)
+      manifest_json.merge! manifest_changes
+      self.version = manifest_json['version']
+  
+      key_path = ChromembedRails.key_path
+      key = OpenSSL::PKey::RSA.new File.read(key_path)
+      # Source: http://supercollider.dk/2010/01/calculating-chrome-extension-id-from-your-private-key-233
+      alg = ["30819F300D06092A864886F70D010101050003818D00"].pack('H*')
+      hash = Digest::SHA256.hexdigest(alg + key.public_key.to_der)[0...32]
+      self.appid = hash.unpack('C*').map{ |c| c < 97 ? c + 49 : c + 10 }.
+                        pack('C*')
+      
+      tmp_path = Rails.root.join 'tmp', "chrome_ext_#{Time.now.to_f}_#{$PID}"
+      ext_path = File.join tmp_path, 'chrome_extension'
+      FileUtils.mkdir_p ext_path
+      FileUtils.cp_r File.join(extension_path, '.'), ext_path
+      man_path = File.join ext_path, 'manifest.json'
+      File.open(man_path, 'wb') do |f|
+        f.write ActiveSupport::JSON.encode manifest_json
+      end
+      
+      crx_path = File.join tmp_path, 'chrome_extension.crx'
+      CrxMake.make :ex_dir => ext_path, :pkey => key_path,
+                   :crx_output => crx_path, :verbose => false
+      self.crx_bits = File.read crx_path
+      FileUtils.rm_r tmp_path
+      
+      self
+    end
+  end  # module ChromembedRails::Model::InstanceMethods
 
-end  # namespace ChromembedRails::Model
+end  # module ChromembedRails::Model
 
 end  # namespace ChromembedRails

data/lib/chromembed_rails/routes.rb

@@ -1,13 +1,8 @@
 require 'action_pack'
 
-# :nodoc: namespace
-module ChromembedRails
-
-# :nodoc: namespace
-module Routes
-
-# :nodoc: mixed into ActionPack's route mapper.
-module MapperMixin
+# :nodoc: adding the chrome_extension method to the route mapper.
+class ActionDispatch::Routing::Mapper
+  # Installs the routes for serving an extension
   def chrome_extension
     get 'chrome_extension.crx' => 'chrome_extension#show',
         :as => :chrome_extension
@@ -15,9 +10,3 @@ module MapperMixin
         :as => :chrome_extension_update
   end
 end
-
-ActionDispatch::Routing::Mapper.send :include, MapperMixin
-
-end  # namespace ChromembedRails::Routes
-
-end  # namespace ChromembedRails

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chromembed_rails
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Victor Costan
@@ -15,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 Z
+date: 2011-07-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +29,12 @@ dependencies:
         - 0
         - 3
         version: 2.0.3
+  type: :runtime
+  requirement: *id001
   prerelease: false
-  version_requirements: *id001
   name: crxmake
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,12 +47,12 @@ dependencies:
         - rc
         - 4
         version: 3.1.0.rc4
+  type: :runtime
+  requirement: *id002
   prerelease: false
-  version_requirements: *id002
   name: rails
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,12 +63,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  type: :development
+  requirement: *id003
   prerelease: false
-  version_requirements: *id003
   name: bundler
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -80,12 +79,12 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
+  type: :development
+  requirement: *id004
   prerelease: false
-  version_requirements: *id004
   name: jeweler
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -96,12 +95,12 @@ dependencies:
         - 9
         - 12
         version: 0.9.12
+  type: :development
+  requirement: *id005
   prerelease: false
-  version_requirements: *id005
   name: mocha
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -110,12 +109,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  type: :development
+  requirement: *id006
   prerelease: false
-  version_requirements: *id006
   name: rcov
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -126,8 +125,9 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
+  type: :development
+  requirement: *id007
   prerelease: false
-  version_requirements: *id007
   name: sqlite3
 description: Ruby on Rails engine for Web applications that are strongly coupled with Chrome extensions
 email: costan@gmail.com
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.4
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Serves a Chrome extension embedded in a Rails application