muck-shares 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/app/helpers/muck_shares_helper.rb

@@ -4,12 +4,14 @@ module MuckSharesHelper
     render :partial => 'shares/share', :collection => shares
   end
 
-  # parent is the object to which the shares will be attached
-  # share is the optional parent share for the new share.
-  def share_form(share = nil, render_new = false)
+  # share is an optional share object that can be used to pre populate the form.
+  # options:
+  # render_new - will determine whether the controller will redirect to new after create or 
+  #              attempt to return to the last page stored by store_location
+  def share_form(share = nil, options = {}, &block)
     share ||= Share.new
-    render :partial => 'shares/form', :locals => { :share => share, :render_new => render_new }
-  end
+    raw_block_to_partial('shares/form', options.merge(:share => share), &block)
+  end  
 
   # Renders a delete button for a share item
   def delete_share(share, button_type = :button, button_text = t("muck.general.delete"))
@@ -20,4 +22,8 @@ module MuckSharesHelper
                                                      :delete_path => share_path(share, :format => 'js') }
   end
 
+  def already_shared?(user, uri)
+    user.shares.find(:all, :conditions => ['uri = ?', uri])
+  end
+  
 end

data/app/views/activity_templates/_share.html.erb

@@ -1,3 +1,3 @@
 <% activity_for(activity, :activity_css_class => 'activity-share') do -%>
-  shared <%= link_to activity.item.title, activity.item.uri %>.  <%= activity.item.message %>
+  <%= t('muck.shares.share_activity_content', :link => link_to(activity.item.title, activity.item.uri, :target => '_blank'), :message => activity.item.message) %>
 <% end -%>

data/app/views/shares/_form.html.erb

@@ -13,10 +13,9 @@
       <%= f.text_area :message, { :label => t('muck.shares.message'),
                                   :class => 'min' } %>
     </div>
-    <%= hidden_field_tag :render_new, render_new ? true : false -%>
+    <%= capture(f, &block) %>
     <div class="button form-row">
       <%= f.submit t('muck.shares.add_share_button'), :class => "button share-submit", :id => "share_submit_#{share.dom_id}" %>
-      <%= f.submit t('muck.shares.cancel_share_button'), :class => "button share-submit", :id => "cancel_submit_#{share.dom_id}" %>
     </div>
   <% end -%>
 </div>

data/app/views/shares/new.html.erb

@@ -1,5 +1,7 @@
 <div id="add_share">
   <h2><%= @page_title %><h2>
   <%= output_errors(t('muck.shares.problem_adding_share'), {:class => 'help-box'}, @share) %>
-  <%= share_form(@share, false) %>
+  <% share_form(@share) do |f| -%>
+    <%= hidden_field_tag :render_new, false -%>
+  <% end -%>
 </div>

data/db/migrate/20090804231857_add_shares_uri_index.rb

@@ -0,0 +1,9 @@
+class AddSharesUriIndex < ActiveRecord::Migration
+  def self.up
+    add_index :shares, :uri
+  end
+
+  def self.down
+    remove_index :shares, :uri
+  end
+end

data/lib/active_record/acts/muck_share.rb

@@ -39,6 +39,7 @@ module ActiveRecord
       # All the methods available to a record that has had <tt>acts_as_muck_share</tt> specified.
       module InstanceMethods
 
+        # Adds activities for the share.
         def add_share_activities(share_to = nil)
           share_to ||= self.shared_by.feed_to
           share_to = [share_to] unless share_to.is_a?(Array)

data/locales/en.yml

@@ -4,9 +4,10 @@ en:
       cant_delete_share: "You don't have permission to delete that share"
       share_removed: "Share successfully removed."
       create_error: "Could not create the share: {{errors}}"
-      create_success: "Successfully added share"
+      create_success: "Successfully shared page"
       add_share: "Share"
       add_share_button: "Share"
+      adding_share: "Sharing page..."
       cancel_share_button: "Cancel"
       new_share: "Share a Link"
       problem_adding_share: "There was a problem adding your share"
@@ -15,5 +16,6 @@ en:
       message: "Message"
       login_prompt: "Login to share"
       share_title: "Share This Link"
+      share_activity_content: "shared {{link}}.  {{message}}"
     activity_templates:
       share: Shares

data/muck-shares.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-shares}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
-  s.date = %q{2009-08-04}
+  s.date = %q{2009-08-08}
   s.description = %q{The share engine for the muck system.}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
      "config/muck_shares_routes.rb",
      "db/migrate/20090803185323_create_shares.rb",
      "db/migrate/20090804184247_add_comment_count_to_shares.rb",
+     "db/migrate/20090804231857_add_shares_uri_index.rb",
      "install.rb",
      "lib/active_record/acts/muck_share.rb",
      "lib/active_record/acts/muck_sharer.rb",
@@ -81,6 +82,7 @@ Gem::Specification.new do |s|
      "test/rails_root/db/migrate/20090730154102_allow_null_user.rb",
      "test/rails_root/db/migrate/20090803185323_create_shares.rb",
      "test/rails_root/db/migrate/20090804184247_add_comment_count_to_shares.rb",
+     "test/rails_root/db/migrate/20090804231857_add_shares_uri_index.rb",
      "test/rails_root/features/shares.feature",
      "test/rails_root/features/step_definitions/common_steps.rb",
      "test/rails_root/features/step_definitions/share_steps.rb",
@@ -328,6 +330,7 @@ Gem::Specification.new do |s|
      "test/rails_root/db/migrate/20090730154102_allow_null_user.rb",
      "test/rails_root/db/migrate/20090803185323_create_shares.rb",
      "test/rails_root/db/migrate/20090804184247_add_comment_count_to_shares.rb",
+     "test/rails_root/db/migrate/20090804231857_add_shares_uri_index.rb",
      "test/rails_root/db/schema.rb",
      "test/rails_root/features/step_definitions/common_steps.rb",
      "test/rails_root/features/step_definitions/share_steps.rb",

data/test/rails_root/db/migrate/20090804231857_add_shares_uri_index.rb

@@ -0,0 +1,9 @@
+class AddSharesUriIndex < ActiveRecord::Migration
+  def self.up
+    add_index :shares, :uri
+  end
+
+  def self.down
+    remove_index :shares, :uri
+  end
+end

data/test/rails_root/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20090804184247) do
+ActiveRecord::Schema.define(:version => 20090804211240) do
 
   create_table "activities", :force => true do |t|
     t.integer  "item_id"
@@ -106,6 +106,7 @@ ActiveRecord::Schema.define(:version => 20090804184247) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "comment_count",                 :default => 0
+    t.integer  "resource_id"
   end
 
   add_index "shares", ["shared_by_id"], :name => "index_shares_on_shared_by_id"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-shares
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Justin Ball
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-04 00:00:00 -06:00
+date: 2009-08-08 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,6 +76,7 @@ files:
 - config/muck_shares_routes.rb
 - db/migrate/20090803185323_create_shares.rb
 - db/migrate/20090804184247_add_comment_count_to_shares.rb
+- db/migrate/20090804231857_add_shares_uri_index.rb
 - install.rb
 - lib/active_record/acts/muck_share.rb
 - lib/active_record/acts/muck_sharer.rb
@@ -129,6 +130,7 @@ files:
 - test/rails_root/db/migrate/20090730154102_allow_null_user.rb
 - test/rails_root/db/migrate/20090803185323_create_shares.rb
 - test/rails_root/db/migrate/20090804184247_add_comment_count_to_shares.rb
+- test/rails_root/db/migrate/20090804231857_add_shares_uri_index.rb
 - test/rails_root/features/shares.feature
 - test/rails_root/features/step_definitions/common_steps.rb
 - test/rails_root/features/step_definitions/share_steps.rb
@@ -394,6 +396,7 @@ test_files:
 - test/rails_root/db/migrate/20090730154102_allow_null_user.rb
 - test/rails_root/db/migrate/20090803185323_create_shares.rb
 - test/rails_root/db/migrate/20090804184247_add_comment_count_to_shares.rb
+- test/rails_root/db/migrate/20090804231857_add_shares_uri_index.rb
 - test/rails_root/db/schema.rb
 - test/rails_root/features/step_definitions/common_steps.rb
 - test/rails_root/features/step_definitions/share_steps.rb