moxify 0.1.5 → 0.1.7

data/.gitignore

@@ -1,49 +1,4 @@
-*.gemspec
 *.gem
 .bundle
 Gemfile.lock
-pkg/*
-
-
-# rcov generated
-coverage
-
-# rdoc generated
-rdoc
-
-# yard generated
-doc
-.yardoc
-
-# bundler
-.bundle
-
-# jeweler generated
-pkg
-
-# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
-#
-# * Create a file at ~/.gitignore
-# * Include files you want ignored
-# * Run: git config --global core.excludesfile ~/.gitignore
-#
-# After doing this, these files will be ignored in all your git projects,
-# saving you from having to 'pollute' every project you touch with them
-#
-# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
-#
-# For MacOS:
-#
-.DS_Store
-#
-# For TextMate
-*.tmproj
-tmtags
-#
-# For emacs:
-#*~
-#\#*
-#.\#*
-#
-# For vim:
-#*.swp
+pkg

data/Rakefile

@@ -1,2 +1,2 @@
 require 'bundler'
-Bundler::GemHelper.install_tasks
+Bundler::GemHelper.install_tasks

data/app/views/welcome.html.erb

@@ -0,0 +1,17 @@
+<% content_for :header, t('.there_are_no_users') %>
+<p>
+  <%=t('.remember_admin_location')%>
+</p>
+<p>
+  <strong><%= [request.protocol, request.host_with_port, '/admin'].join %></strong>
+</p>
+<p>
+  <%= t('.lets_start') %>
+</p>
+
+<div class='form-actions'>
+  <div class='form-actions-left'>
+    <%= link_to t('.continue'), new_user_registration_path,
+                :class => 'button' %>
+  </div>
+</div>

data/config/locales/de.yml

@@ -0,0 +1,18 @@
+en:
+  plugins:
+    refinery_core:
+      title: Core
+      description: Core Plugin
+    refinery_dialogs:
+      description: Dialog Plugin
+    refinery_dashboard:
+      description: Gibt eine Übersicht über Aktivitäten
+    refinery_settings:
+      description: Einstellungen verwalten
+  welcome:
+    remember_admin_location: "Merken Sie sich Ihren Administrationsbereich:"
+  users:
+    create:
+      welcome: 'Willkommen %{who}'
+    forgot:
+      password_encryption: 'Sie müssen ihr Passwort zurücksetzen, da es Änderungen in der Art der Passwortverschlüsselung gab, sodass Passwörter noch stärker verschlüsselt werden als vorher.'

data/config/locales/en.yml

@@ -0,0 +1,19 @@
+en:
+  plugins:
+    refinery_core:
+      title: Core
+      description: Core plugin
+    refinery_dialogs:
+      title: Dialogs
+      description: Dialogs plugin
+    refinery_dashboard:
+      description: Gives an overview of activity
+    refinery_settings:
+      description: Manage settings
+  welcome:
+    remember_admin_location: "Remember your admin area is at:"
+  users:
+    create:
+      welcome: 'Welcome %{who}'
+    forgot:
+      password_encryption: You need to reset your password because there were changes in the password encryption methods so that passwords are stored with even stronger encryption than before.

data/config/routes.rb

@@ -1,45 +1,5 @@
-Refinery::Application.routes.draw do
-  #match '/admin(/*path)' => 'admin/base#error_404'
-  #match '/admin' => 'admin/dashboard#index'
-  get 'admin', :to => 'admin/dashboard#index', :as => :refinery_root
-  get 'admin', :to => 'admin/dashboard#index', :as => :user_root
-  
-  scope :except => :show do
-    namespace :admin do
-      
-      # refinerycms-pages
-      resources :pages do
-        post :update_positions, :on => :collection
-      end
-      
-      resources :pages_dialogs, :only => [] do
-        collection do
-          get :link_to
-          get :test_url
-          get :test_email
-        end
-      end
-
-      resources :page_parts, :only => [:new, :create, :destroy]
-      
-      # refinerycms-images
-      resources :images
-      
-      # refinerycms-authentication
-      resources :users
-      
-      # refinerycms-resources
-      resources :resources
-      
-      # refinerycms-settings
-      resources :settings,
-                :except => :show,
-                :as => :refinery_settings,
-                :controller => :refinery_settings
-                
-      # refinerycms-dashboard
-      root :to => 'dashboard#index'
-      resources :dialogs, :only => :show
-    end
-  end
+::Refinery::Application.routes.draw do
+  match '/refinery(/*path)', :to => redirect {|params, request|
+    "/admin#{"/#{params[:path]}" unless params[:path].blank?}"
+  }
 end

data/lib/moxify/version.rb

@@ -1,3 +1,3 @@
 module Moxify
-  VERSION = "0.1.5"
-end
+  VERSION = "0.1.7"
+end

data/lib/moxify.rb

@@ -1,23 +1,64 @@
-require 'refinery'
-require 'moxify/url_tempfile'
+require 'refinerycms-base'
 
-module Refinery
-  module Moxify
-    class Engine < Rails::Engine
-      initializer "static assets" do |app|
-        app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public"
+module Moxify
+  
+  class Engine < Rails::Engine
+    
+    initializer "static assets" do |app|
+      app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public"
+    end
+    
+    initializer "require dragonfly hook" do |app|
+      require 'moxify/dragonfly_quality_hook'
+    end
+    
+    config.after_initialize do
+      ::Refinery::Plugin.register do |plugin|
+        plugin.name ="moxification"
+        plugin.version = Moxify::VERSION
+        plugin.hide_from_menu = true
+        plugin.always_allow_access = true
       end
+    end
+    
+    # override refinery routes to use admin namespace
+    initializer "moxify.override_routing", :after => :disable_dependency_loading do |app|
       
-      initializer "require dragonfly hook" do |app|
-        require 'moxify/dragonfly_quality_hook'
+      # override routes
+      collected_routes = []
+      Rails.application.routes.routes.each do |route|
+        if  route.path =~ /refinery/ and
+            not route.path =~ /^\/refinery\(\/\*path\)/ # this is our catch all route
+          
+          route.instance_variable_set "@path", route.path.gsub(/refinery/, "admin")
+          
+          # make sure we generate new path_info for changed paths
+          conditions = route.conditions
+          conditions[:path_info] = ::Rack::Mount::Strexp.compile(route.path, route.requirements, ::ActionDispatch::Routing::SEPARATORS, true)
+          
+          # overwrite conditions with new path_info
+          route.instance_variable_set "@conditions", conditions
+        end
+        
+        # add every route to our collection
+        collected_routes << route
       end
+            
+      # clear set 
+      _routes = Rails.application.routes
+      _routes.clear!
+      _routes.disable_clear_and_finalize = false
       
-      ::Refinery::Plugin.register do |plugin|
-        plugin.name ="moxify"
-        plugin.version = "0.1.3"
-        plugin.hide_from_menu = true
-        plugin.always_allow_access = true
+      # now put our collected routes in
+      for route in collected_routes
+        _routes.add_route(route.app, route.conditions, route.requirements, route.defaults, route.name)
       end
+      
+      # finalize
+      _routes.finalize!
+      
     end
+    
   end
-end
+  
+end

data/moxify.gemspec

@@ -6,44 +6,16 @@ Gem::Specification.new do |s|
   s.name              = %q{moxify}
   s.version           = Moxify::VERSION
   s.description       = 'A blanket full of toy cars for Refinery CMS'
-  s.date              = %q{2011-04-20}
   s.summary           = 'My port of Refinery CMS'
   s.email             = %q{mail@bitflut.com}
   s.homepage          = %q{http://bitflut.com}
   s.authors           = ['Marian Andre']
   s.license           = %q{MIT}
-  s.require_paths     = %w(lib)
-  s.files             = Dir['lib/**/*', 'config/**/*', 'app/**/*', 'public/**/*']
   
-  s.add_dependency    'refinerycms', '~> 0.9.9.10'
-  
-  s.files             = [
-    '.gitignore',
-    'Gemfile',
-    'Gemfile',
-    'Rakefile',
-    'app',
-    'app/views',
-    'app/views/admin',
-    'app/views/admin/_head.html.erb',
-    'app/views/layouts',
-    'app/views/layouts/application.html.erb',
-    'app/views/shared',
-    'app/views/shared/_site_bar.html.erb',
-    'config',
-    'config/routes.rb',
-    'lib',
-    'lib/gemspec.rb',
-    'lib/moxify',
-    'lib/moxify/dragonfly_quality_hook.rb',
-    'lib/moxify/url_tempfile.rb',
-    'lib/moxify/version.rb',
-    'lib/moxify.rb',
-    'moxify.gemspec',
-    'public',
-    'public/stylesheets',
-    'public/stylesheets/refinery',
-    'public/stylesheets/refinery/moxify.css',
-    'public/stylesheets/refinery/site_bar.css'
-  ]
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib", "config", "app", "public"]
+    
+  s.add_dependency    'refinerycms', '~> 0.9.9.18'  
 end

data/spec/requests/routes_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe "Moxify routing" do
+  
+  it "should redirect on /refinery visit", :type => :request do
+    get '/refinery'
+    response.should redirect_to '/admin'
+  end
+  
+  it "should redirect past refinery", :type => :request do
+    get '/refinery/dialogs/images'
+    response.should redirect_to '/admin/dialogs/images'
+  end
+  
+  it "should override refinery root to /admin", :type => :request do
+    refinery_root_path.should == "/admin"
+  end
+  
+  it "should override plugin paths", :type => :request do
+    [
+      {name:'pages',path:'/admin/pages'},
+      {name:'dashboard',path:'/admin/dashboard'},
+      {name:'images',path:'/admin/images'},
+      {name:'resources',path:'/admin/resources'},
+      {name:'refinery_settings',path:'/admin/settings'}
+    ].each do |plugin|
+      eval("admin_#{plugin[:name]}_path").should == plugin[:path]
+    end
+  end
+  
+end

data/spec/views/sign_up_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe "welcome.html.erb" do
+  
+  context "given no user exists" do
+    
+    before(:each) do
+      view.stub(:just_installed?) { true }
+      view.stub(:from_dialog?) { false }
+    end
+    
+    it "should see /admin reminder" do
+      assign :user, stub_model(User).as_new_record
+      render
+      # view.content_for(:header).should contain("refinery")
+      render.should_not contain("Refinery")
+      render.should_not contain("refinery")
+    end
+    
+  end
+  
+end

metadata

@@ -2,7 +2,7 @@
 name: moxify
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors: 
 - Marian Andre
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 +02:00
+date: 2011-04-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.10
+        version: 0.9.9.18
   type: :runtime
   version_requirements: *id001
 description: A blanket full of toy cars for Refinery CMS
@@ -39,15 +39,18 @@ files:
 - app/views/admin/_head.html.erb
 - app/views/layouts/application.html.erb
 - app/views/shared/_site_bar.html.erb
+- app/views/welcome.html.erb
+- config/locales/de.yml
+- config/locales/en.yml
 - config/routes.rb
-- lib/gemspec.rb
+- lib/moxify.rb
 - lib/moxify/dragonfly_quality_hook.rb
-- lib/moxify/url_tempfile.rb
 - lib/moxify/version.rb
-- lib/moxify.rb
 - moxify.gemspec
 - public/stylesheets/refinery/moxify.css
 - public/stylesheets/refinery/site_bar.css
+- spec/requests/routes_spec.rb
+- spec/views/sign_up_spec.rb
 has_rdoc: true
 homepage: http://bitflut.com
 licenses: 
@@ -57,6 +60,9 @@ rdoc_options: []
 
 require_paths: 
 - lib
+- config
+- app
+- public
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
@@ -76,5 +82,6 @@ rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: My port of Refinery CMS
-test_files: []
-
+test_files: 
+- spec/requests/routes_spec.rb
+- spec/views/sign_up_spec.rb

data/lib/gemspec.rb

@@ -1,54 +0,0 @@
-#!/usr/bin/env ruby
-require 'pathname'
-gempath = Pathname.new(File.expand_path('../../', __FILE__))
-
-files = %w( Gemfile *.md **/**/{*,.rspec,.gitignore,.yardopts} ).map { |file| Pathname.glob(file) }.flatten
-rejection_patterns = [
-  "^public/system",
-  "^config/(application|boot|environment).rb$",
-  "^config/initializers(\/.*\.rb)?$",
-  "^config/(database|i18n\-js).yml$",
-  "^lib\/gemspec\.rb",
-  ".*\/cache\/",
-  "^script\/*",
-  "^vendor\/plugins\/?$",
-  "(^log|\.log)$",
-  "\.rbc$",
-  "^tmp(|/.+?)$",
-  ".gem$",
-  "^doc($|\/)"
-]
-
-files.reject! do |f|
-  !f.exist? or (f.directory? and f.children.empty?) =~ %r{(#{rejection_patterns.join(')|(')})}
-end
-
-gemspec = <<EOF
-# DO NOT EDIT THIS FILE DIRECTLY! Instead, use lib/gemspec.rb to generate it.
-$:.push File.expand_path("../lib", __FILE__)
-require "moxify/version"
-
-Gem::Specification.new do |s|
-  s.name              = %q{#{gemname = 'moxify'}}
-  s.version           = Moxify::VERSION
-  s.description       = 'A blanket full of toy cars for Refinery CMS'
-  s.date              = %q{#{Time.now.strftime('%Y-%m-%d')}}
-  s.summary           = 'My port of Refinery CMS'
-  s.email             = %q{mail@bitflut.com}
-  s.homepage          = %q{http://bitflut.com}
-  s.authors           = ['Marian Andre']
-  s.license           = %q{MIT}
-  s.require_paths     = %w(lib)
-  s.files             = Dir['lib/**/*', 'config/**/*', 'app/**/*', 'public/**/*']
-  
-  s.add_dependency    'refinerycms', '~> 0.9.9.10'
-  
-  s.files             = [
-    '#{files.sort.join("',\n    '")}'
-  ]
-end
-EOF
-
-
-(gemfile = gempath.join("#{gemname}.gemspec")).open('w') {|f| f.puts(gemspec)}
-puts `cd #{gempath} && gem build #{gemfile}` if ARGV.any?{|a| a == "BUILD=true"}

data/lib/moxify/url_tempfile.rb

@@ -1,17 +0,0 @@
-class URLTempfile < Tempfile
-
-  def initialize(url)
-    @url = URI.parse(url)
-
-    begin
-      super('url', Dir.tmpdir, :encoding => 'ascii-8bit')
-
-      Net::HTTP.start(@url.host) do |http|
-        resp = http.get(@url.path)
-        self.write resp.body
-      end
-    ensure
-    end
-  end
-
-end