merb-photos 0.1.2 → 0.2

data/README

@@ -21,8 +21,6 @@ a
 Merb::BootLoader.before_app_loads do
   Merb::Slices::config[:merb_photos][:title] = 'Photos' #Title of the index page and/or tab.
   Merb::Slices::config[:merb_photos][:flickr_user_name] = 'your_user_name' #Flickr user name.
-  Merb::Slices::config[:merb_photos][:flickr_api_key] = '********************************' #Flickr API key.
-  Merb::Slices::config[:merb_photos][:flickr_shared_secret] = '****************' #Flickr shared secret.
 end
 
 esc : wq

data/Rakefile

@@ -8,7 +8,7 @@ AUTHOR = 'uipoet'
 EMAIL = 'dont.tase@me.com'
 HOMEPAGE = 'http://uipoet.com/projects'
 SUMMARY = 'Flickr Photo Gallery for Merb'
-GEM_VERSION = '0.1.2'
+GEM_VERSION = '0.2'
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = AUTHOR

data/app/controllers/photos.rb

@@ -1,10 +1,5 @@
 class MerbPhotos::Photos < MerbPhotos::Application
-
-  load_dependency 'flickraw'
   
-  FlickRaw.api_key = MerbPhotos[:flickr_api_key]
-  FlickRaw.shared_secret = MerbPhotos[:flickr_shared_secret]
-
   def index
     @photosets = flickr.photosets.getList :user_id => user_id
     photoset_id = params[:photoset_id] || @photosets.first.id

data/lib/merb-photos.rb

@@ -2,55 +2,15 @@ if defined?(Merb::Plugins)
 
   $:.unshift File.dirname(__FILE__)
 
-  load_dependency 'merb-ui'
+  load_dependencies 'flickraw', 'merb-ui'
   Merb::Plugins.add_rakefiles "merb-photos/merbtasks", "merb-photos/slicetasks", "merb-photos/spectasks"
 
-  # Register the Slice for the current host application
   Merb::Slices::register(__FILE__)
   
-  # Slice configuration - set this in a before_app_loads callback.
-  # By default a Slice uses its own layout, so you can swicht to 
-  # the main application layout or no layout at all if needed.
-  # 
-  # Configuration options:
-  # :layout - the layout to use; defaults to :merb-photos
-  # :mirror - which path component types to use on copy operations; defaults to all
   Merb::Slices::config[:merb_photos][:layout] ||= :application
   
-  # All Slice code is expected to be namespaced inside a module
   module MerbPhotos
     
-    # Slice metadata
-    self.description = "Merb UI Photos"
-    self.version = "1.0"
-    self.author = "UI Poet"
-    
-    # Stub classes loaded hook - runs before LoadClasses BootLoader
-    # right after a slice's classes have been loaded internally.
-    def self.loaded
-    end
-    
-    # Initialization hook - runs before AfterAppLoads BootLoader
-    def self.init
-    end
-    
-    # Activation hook - runs after AfterAppLoads BootLoader
-    def self.activate
-    end
-    
-    # Deactivation hook - triggered by Merb::Slices.deactivate(MerbPhotos)
-    def self.deactivate
-    end
-    
-    # Setup routes inside the host application
-    #
-    # @param scope<Merb::Router::Behaviour>
-    #  Routes will be added within this scope (namespace). In fact, any 
-    #  router behaviour is a valid namespace, so you can attach
-    #  routes at any level of your router setup.
-    #
-    # @note prefix your named routes with :merb_photos_
-    #   to avoid potential conflicts with global named routes.
     def self.setup_router(scope)
       scope.to(:controller => 'photos') do |p|
         p.match('/photo').to(:action => 'photo').name(:photo)
@@ -60,21 +20,6 @@ if defined?(Merb::Plugins)
     
   end
   
-  # Setup the slice layout for MerbPhotos
-  #
-  # Use MerbPhotos.push_path and MerbPhotos.push_app_path
-  # to set paths to merb-photos-level and app-level paths. Example:
-  #
-  # MerbPhotos.push_path(:application, MerbPhotos.root)
-  # MerbPhotos.push_app_path(:application, Merb.root / 'slices' / 'merb-photos')
-  # ...
-  #
-  # Any component path that hasn't been set will default to MerbPhotos.root
-  #
-  # Or just call setup_default_structure! to setup a basic Merb MVC structure.
   MerbPhotos.setup_default_structure!
   
-  # Add dependencies for other MerbPhotos classes below. Example:
-  # dependency "merb-photos/other"
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-photos
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: "0.2"
 platform: ruby
 authors: 
 - uipoet
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-27 00:00:00 -08:00
+date: 2008-12-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency