scottmotte-merb-auth-slice-multisite 1.0.7.1 → 1.0.10

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008 Scott Motte
+Copyright (c) 2009 scottmotte
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ 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.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.textile

@@ -4,12 +4,12 @@ This slice setups multisite capabilities in your merb application with an authen
 
 It works for subdomains (i.e. coolcars.yourapp.com) or for domains routed to your application via your server (i.e. coolcars.com). 
 
-It a check to make match a user to the site he's trying to login to.
-
-<object width="400" height="300"><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id=2844037&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=&amp;fullscreen=1" /><embed src="http://vimeo.com/moogaloop.swf?clip_id=2844037&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=&amp;fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="400" height="300"></embed></object><br /><a href="http://vimeo.com/">merb-auth-slice-multisite installation</a> from <a href="http://vimeo.com/user1166117">Scott Motte</a> on <a href="http://vimeo.com">Vimeo</a>.
+It has a check to make a user to the site he's trying to login to. If the user does not match than authentication fails.
 
 h2. Instructions for installation:
 
+0. Check out the video. <a href="http://scottmotte.github.com/merb-auth-slice-multisite/">How to install merb-auth-slice-multisite in your application.</a>
+
 1. Download the gem and install.
 <pre><code># from your terminal
 cd ~
@@ -21,7 +21,7 @@ sudo rake install
 </code></pre>
 
 2. Setup your application to use the gem.* Add the following to the end of dependencies.rb.
-<pre><code>dependency "merb-auth-slice-multisite", "1.0.7.1"</code></pre>
+<pre><code>dependency "merb-auth-slice-multisite", "0.2"</code></pre>
 
 3. Add in mixin. In your user model or in merb/merb-auth/setup.rb add the mixin 
 include Merb::Authentication::Mixins::UserBelongsToSite and then migrate your database.

data/VERSION.yml

@@ -0,0 +1,4 @@
+--- 
+:major: 1
+:minor: 0
+:patch: 10

data/lib/merb-auth-slice-multisite.rb

@@ -26,7 +26,7 @@ if defined?(Merb::Plugins)
     
     # Slice metadata
     self.description = "Merb Slice that adds basic multisite functionality to merb-auth."
-    self.version = "1.0.7.1"
+    self.version = "0.2"
     self.author = "Scott Motte"
     
     # Stub classes loaded hook - runs before LoadClasses BootLoader

data/test/merb_auth_slice_multisite_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class MerbAuthSliceMultisiteTest < Test::Unit::TestCase
+  should "probably rename this file and start testing for real" do
+    flunk "hey buddy, you should probably rename this file and start testing for real"
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+require 'test/unit'
+require 'shoulda'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'merb_auth_slice_multisite'
+
+class Test::Unit::TestCase
+end

metadata

@@ -1,45 +1,19 @@
 --- !ruby/object:Gem::Specification 
 name: scottmotte-merb-auth-slice-multisite
 version: !ruby/object:Gem::Version 
-  version: 1.0.7.1
+  version: 1.0.10
 platform: ruby
 authors: 
-- Scott Motte
+- scottmotte
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-01-15 00:00:00 -08:00
+date: 2009-03-27 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: merb-slices
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: merb-auth-core
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: merb-auth-more
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.0"
-    version: 
-description: Merb Slice that adds basic multisite functionality to merb-auth.
+dependencies: []
+
+description: 
 email: scott@scottmotte.com
 executables: []
 
@@ -48,21 +22,9 @@ extensions: []
 extra_rdoc_files: 
 - README.textile
 - LICENSE
-- TODO
 files: 
-- LICENSE
 - README.textile
-- Rakefile
-- TODO
-- app/controllers
-- app/controllers/application.rb
-- app/helpers
-- app/helpers/application_helper.rb
-- app/models
-- app/models/site.rb
-- app/views
-- app/views/layout
-- app/views/layout/merb-auth-slice-multisite.html.erb
+- VERSION.yml
 - lib/merb-auth-slice-multisite
 - lib/merb-auth-slice-multisite/merbtasks.rb
 - lib/merb-auth-slice-multisite/mixins
@@ -72,20 +34,18 @@ files:
 - lib/merb-auth-slice-multisite/slicetasks.rb
 - lib/merb-auth-slice-multisite/spectasks.rb
 - lib/merb-auth-slice-multisite.rb
-- public/javascripts
-- public/javascripts/master.js
-- public/stylesheets
-- public/stylesheets/master.css
+- lib/merb_auth_slice_multisite.rb
+- test/merb_auth_slice_multisite_test.rb
+- test/test_helper.rb
 - spec/merb-auth-slice-multisite_spec.rb
 - spec/spec_helper.rb
-- stubs/app
-- stubs/app/controllers
-- stubs/app/controllers/application.rb
+- LICENSE
 has_rdoc: true
-homepage: http://scottmotte.com/
+homepage: http://github.com/scottmotte/merb-auth-slice-multisite
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --inline-source
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -102,10 +62,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: merb
+rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Merb Slice that adds basic multi-site functionality to merb-auth.
+summary: Merb Slice that adds basic multisite functionality to merb-auth.
 test_files: []
 

data/Rakefile

@@ -1,56 +0,0 @@
-require 'rubygems'
-require 'rake/gempackagetask'
-require 'merb-core'
-require 'merb-core/tasks/merb'
-
-GEM_NAME = "merb-auth-slice-multisite"
-AUTHOR = "Scott Motte"
-EMAIL = "scott@scottmotte.com"
-HOMEPAGE = "http://scottmotte.com/"
-SUMMARY = "Merb Slice that adds basic multisite functionality to merb-auth."
-GEM_VERSION = "1.0.7.1"
-
-spec = Gem::Specification.new do |s|
-  s.rubyforge_project = 'merb'
-  s.name = GEM_NAME
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README.textile", "LICENSE"]
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.add_dependency('merb-slices', '>= 1.0')
-  s.add_dependency('merb-auth-core', '>= 1.0')
-  s.add_dependency('merb-auth-more', '>= 1.0')
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README.textile Rakefile) + Dir.glob("{lib,spec,app,public,stubs}/**/*")
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "Install the gem"
-task :install do
-  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
-end
-
-desc "Uninstall the gem"
-task :uninstall do
-  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
-end
-
-desc "Create a gemspec file"
-task :gemspec do
-  File.open("#{GEM_NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
-  end
-end
-
-require 'spec/rake/spectask'
-require 'merb-core/test/tasks/spectasks'
-desc 'Default: run spec examples'
-task :default => 'spec'

data/TODO

@@ -1,3 +0,0 @@
-TODO:
-
-- coming soon

data/app/controllers/application.rb

@@ -1,5 +0,0 @@
-class MerbAuthSliceMultisite::Application < Merb::Controller
-  
-  controller_for_slice
-  
-end

data/app/helpers/application_helper.rb

@@ -1,64 +0,0 @@
-module Merb
-  module MerbAuthSliceMultisite
-    module ApplicationHelper
-      
-      # @param *segments<Array[#to_s]> Path segments to append.
-      #
-      # @return <String> 
-      #  A path relative to the public directory, with added segments.
-      def image_path(*segments)
-        public_path_for(:image, *segments)
-      end
-      
-      # @param *segments<Array[#to_s]> Path segments to append.
-      #
-      # @return <String> 
-      #  A path relative to the public directory, with added segments.
-      def javascript_path(*segments)
-        public_path_for(:javascript, *segments)
-      end
-      
-      # @param *segments<Array[#to_s]> Path segments to append.
-      #
-      # @return <String> 
-      #  A path relative to the public directory, with added segments.
-      def stylesheet_path(*segments)
-        public_path_for(:stylesheet, *segments)
-      end
-      
-      # Construct a path relative to the public directory
-      # 
-      # @param <Symbol> The type of component.
-      # @param *segments<Array[#to_s]> Path segments to append.
-      #
-      # @return <String> 
-      #  A path relative to the public directory, with added segments.
-      def public_path_for(type, *segments)
-        ::MerbAuthSliceMultisite.public_path_for(type, *segments)
-      end
-      
-      # Construct an app-level path.
-      # 
-      # @param <Symbol> The type of component.
-      # @param *segments<Array[#to_s]> Path segments to append.
-      #
-      # @return <String> 
-      #  A path within the host application, with added segments.
-      def app_path_for(type, *segments)
-        ::MerbAuthSliceMultisite.app_path_for(type, *segments)
-      end
-      
-      # Construct a slice-level path.
-      # 
-      # @param <Symbol> The type of component.
-      # @param *segments<Array[#to_s]> Path segments to append.
-      #
-      # @return <String> 
-      #  A path within the slice source (Gem), with added segments.
-      def slice_path_for(type, *segments)
-        ::MerbAuthSliceMultisite.slice_path_for(type, *segments)
-      end
-      
-    end
-  end
-end

data/app/models/site.rb

@@ -1,37 +0,0 @@
-class Site
-  include DataMapper::Resource
-  
-  # Schema
-  property :id, Serial
-  property :domain, String, :nullable => :false, :length => (1..40), :unique => true, :format => /(\.[a-z]{2,4})$/
-  property :folder, String, :nullable => :false, :length => (1..40), :unique => true
-  property :subdomain, String, :nullable => :false, :length => (1..40), :unique => true, :format => /^[a-zA-Z0-9\-]*?$/
-    
-  # Relationships/Associates
-  has n, :users, :order => [:login.asc]
-  
-  # Validations
-  validates_with_method :check_subdomain
-  
-  ReservedSubdomains = %w[backstage admin blog dev ftp mail email pop pop3 imap smtp stage stats status www]
-  def check_subdomain
-    if ReservedSubdomains.include?(self.subdomain)
-      [false, "Subdomain '#{self.subdomain}' is reserved."]
-    else
-      true
-    end
-  end
-  
-  # Hooks
-  before :valid?, :remove_http_and_www
-  def remove_http_and_www
-    domain.gsub!('http://', '')
-    domain.gsub!('www.', '')
-  end
-  
-  before :save, :generate_folder
-  def generate_folder
-    self.folder = domain.gsub('.', '')
-  end
-
-end

data/app/views/layout/merb-auth-slice-multisite.html.erb

@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <title>Fresh MerbAuthSliceMultisite Slice</title>
-    <link href="<%= public_path_for :stylesheet, 'master.css' %>" type="text/css" charset="utf-8" rel="stylesheet" media="all" />
-    <script src="<%= public_path_for :javascript, 'master.js' %>" type="text/javascript" charset="utf-8"></script>
-  </head>
-  <!-- you can override this layout at slices/merb-auth-slice-multisite/app/views/layout/merb-auth-slice-multisite.html.erb -->
-  <body class="merb-auth-slice-multisite-slice">
-  <div id="container">
-	  <h1>MerbAuthSliceMultisite Slice</h1>
-    <div id="main"><%= catch_content :for_layout %></div>
-  </div>
-  </body>
-</html>

data/public/stylesheets/master.css

@@ -1,2 +0,0 @@
-html, body { margin: 0; padding: 0; }
-#container { width: 800px; margin: 4em auto; padding: 4em 4em 6em 4em; background: #DDDDDD; }

data/stubs/app/controllers/application.rb

@@ -1,2 +0,0 @@
-class MerbAuthSliceMultisite::Application < Merb::Controller
-end