my_timeline 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dc41e97ee667d76451c4748063224261192dc19
-  data.tar.gz: 7e3e7954e8bed1f8954be7ca8a9878f66b7f6627
+  metadata.gz: 180963925c947c23df9af5971da60bee552c0a8a
+  data.tar.gz: 7c1c93ed23f8eb0042a49fc1980bf0983d8156aa
 SHA512:
-  metadata.gz: 0e41fdf3838665cd3fc65e0d062caf1fbae53f36cccadead28932141d8d2ebc2e07fcdc10168471b86dd26556a095d1b4dea27cae58335575ac3a9eb32eca1cd
-  data.tar.gz: d122dc6617636a46592fb3f35d1ae02adb82d9e962b80d37968034e6c6e4222d065407e72942eb46d6b64ffa6869f88f3ab969d5cc0c7af2c39ebfbfc64bd07b
+  metadata.gz: 7772eed0229ad702ca03290f9e86755eb0eee82df4a78463f119f55be92f654b4e7ee9fd9977d809aa627d19bc666714795eec9cdf91a0c0064edb58fb0d5c9e
+  data.tar.gz: 3586a2d72d86d44d9dea55a77956db5a7f8d6ef288f5861031a3d9495bf308f3470b18f22a4a29d1debfa0ed2084e2272ff4ef413eadb35a06da48a157cc03ab

data/.travis.yml

@@ -4,6 +4,9 @@ rvm:
   - 2.0.0
 env:
   - DB=sqlite
+gemfile:
+  - gemfiles/Gemfile.rails-3.x
+  - gemfiles/Gemfile.rails-4.x
 script:
   - RAILS_ENV=test bundle exec rake db:migrate
   - bundle exec rake

data/CHANGELOG.markdown

@@ -0,0 +1,12 @@
+# 0.0.4
+  * Added Rails 4 compatibility
+  * Added more tests
+
+# 0.0.3
+  * Fixed external event link
+
+# 0.0.2
+  * Many, many bugfixes
+
+# 0.0.1
+  * Initial release

data/README.markdown

@@ -1,7 +1,5 @@
-
-
 # My Timeline [![Code Climate](https://codeclimate.com/github/JustinAiken/my_timeline.png)](https://codeclimate.com/github/JustinAiken/my_timeline) [![Build Status](https://secure.travis-ci.org/JustinAiken/my_timeline.png?branch=master)](http://travis-ci.org/JustinAiken/my_timeline)
-#### A social-media aggregation/display plugin 
+#### A social-media aggregation/display plugin
 
 This is a Rails Engine to help pull in content from any number of social media sites, services, or websites.
 The aggregated information is displayed in a unified timeline.
@@ -12,7 +10,8 @@ It is being developed with extensibility in mind - each service will have it's o
 ![Screenshot](doc/screenshot.png)
 
 ### Requirements:
-- Rails 3.x - Rails 4 is not currently supported, but it's on the todo..
+- Ruby 1.9.3 or 2.x
+- Rails 3.1.x or 3.2.x or 4.x
 - Bootstrap (or bootstrap-named classes) - For the markup.  Just stuff like `table.table-striped`, no stuctural markup from Bootstrap is needed
 - Any standard ActiveRecord-compatible database should work
 

data/app/controllers/my_timeline/events_controller.rb

@@ -15,7 +15,7 @@ module MyTimeline
     end
 
     def show
-
+      #
     end
 
     def edit
@@ -24,7 +24,7 @@ module MyTimeline
 
     def update
       @event = Event.find_by_id(params[:id])
-      if @event.update_attributes(params[:event])
+      if @event.update_attributes(rails4? ? event_params : params[:event])
         redirect_to root_path, notice: "Edit successful."
       else
         render 'edit'
@@ -49,5 +49,11 @@ module MyTimeline
         end
       end
     end
+
+    if rails4?
+      define_method :event_params do
+        params.required(:event).permit :description, :happened_on, :public
+      end
+    end
   end
 end

data/app/controllers/my_timeline/posts_controller.rb

@@ -7,7 +7,7 @@ module MyTimeline
     end
 
     def create
-      @post  = Post.new(params[:post])
+      @post  = Post.new(rails4? ? post_params : params[:post])
 
       @post.event.happened_on = @post.happened_on
       @post.event.user_id     = @user.id
@@ -22,5 +22,13 @@ module MyTimeline
         render :new
       end
     end
+
+  private
+
+    if rails4?
+      define_method :post_params do
+        params.required(:post).permit :happened_on, :full_text, event_attributes: [:description, :public]
+      end
+    end
   end
 end

data/app/models/my_timeline/event.rb

@@ -1,9 +1,12 @@
 module MyTimeline
   class Event < ActiveRecord::Base
-    attr_accessible :description, :happened_on, :icon_name, :external_link, :original_id, :public, :importance
-    attr_accessible :user, :linkable, :user_id, :linkable_type, :linkable_id
 
-    belongs_to :linkable, polymorphic: true, dependent: :destroy
+    unless rails4?
+      attr_accessible :description, :happened_on, :icon_name, :external_link, :original_id, :public, :importance
+      attr_accessible :user, :linkable, :user_id, :linkable_type, :linkable_id
+    end
+
+    belongs_to :linkable, polymorphic: true, dependent: :delete
     belongs_to :user, class_name: MyTimeline.user_class.to_s
 
     validates :description, presence: true

data/app/models/my_timeline/post.rb

@@ -1,7 +1,10 @@
 module MyTimeline
   class Post < ActiveRecord::Base
-    attr_accessible :happened_on, :full_text
-    attr_accessible :event, :event_id, :event_attributes
+
+    unless rails4?
+      attr_accessible :happened_on, :full_text
+      attr_accessible :event, :event_id, :event_attributes
+    end
 
     belongs_to :event, dependent: :destroy
 

data/config/routes.rb

@@ -4,5 +4,5 @@ MyTimeline::Engine.routes.draw do
   resources :events
   resources :posts
 
-  match "control_panel" => "control_panel#index", as: "control_panel"
+  get "control_panel" => "control_panel#index", as: "control_panel"
 end

data/db/migrate/20131103000200_create_my_timeline_settings.rb

@@ -9,6 +9,6 @@ class CreateMyTimelineSettings < ActiveRecord::Migration
       t.timestamps
     end
 
-    add_index :my_timeline_settings, [ :target_type, :target_id, :var ], :unique => true
+    add_index :my_timeline_settings, [ :target_type, :target_id, :var ], :unique => true, :name => "index_my_timeline_settings_on_user"
   end
 end

data/gemfiles/Gemfile.rails-3.x

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gemspec :path => '..'
+
+gem "jquery-rails"
+gem "rails", "~>3.2"

data/gemfiles/Gemfile.rails-4.x

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gemspec :path => '..'
+
+gem "jquery-rails"
+gem "rails", ">4.0"

data/lib/my_timeline/core_ext/rails4.rb

@@ -0,0 +1,5 @@
+module Kernel
+  define_method :rails4? do
+    Rails::VERSION::MAJOR >= 4
+  end
+end

data/lib/my_timeline/engine.rb

@@ -1,4 +1,5 @@
 require 'my_timeline/settings_ext'
+require 'my_timeline/core_ext/rails4'
 
 module MyTimeline
   class Engine < ::Rails::Engine

data/lib/my_timeline/version.rb

@@ -1,3 +1,3 @@
 module MyTimeline
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/my_timeline.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")
 
-  s.add_runtime_dependency "rails", ['>= 3.2', '< 4.0']
+  s.add_runtime_dependency "rails", ['> 2.0']
   s.add_runtime_dependency "kaminari"
   s.add_runtime_dependency 'ledermann-rails-settings'
 

data/spec/controllers/my_timeline/application_controller_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe MyTimeline::ApplicationController do
+  describe "#find_user" do
+
+    before { subject.params = {user_id: "7"} }
+    after do
+      subject.params.should == {}
+    end
+
+    context "when the user exists" do
+      it "sets some variables" do
+        MyTimeline::UserStub.should_receive(:find_by_id).with("7").and_return "foo"
+        subject.stub(:current_user).and_return "foo"
+        subject.send :find_user
+        subject.instance_variable_get(:@owner_viewing).should be_true
+        subject.instance_variable_get(:@show_hidden).should   be_true
+      end
+    end
+
+    context "when the user is not found" do
+      it "doesn't do much" do
+        subject.stub(:current_user).and_return nil
+        subject.send :find_user
+        subject.instance_variable_get(:@owner_viewing).should be_false
+        subject.instance_variable_get(:@show_hidden).should   be_false
+      end
+    end
+  end
+end

data/spec/controllers/my_timeline/control_panel_controller_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe MyTimeline::ControlPanelController do
+  routes { MyTimeline::Engine.routes }
+
+  before { ApplicationController.any_instance.stub :current_user }
+
+  describe "GET #index" do
+    it "gets okay" do
+      get "index"
+      response.code.should == "200"
+    end
+  end
+end

data/spec/controllers/my_timeline/events_controller_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe MyTimeline::EventsController do
+  routes { MyTimeline::Engine.routes }
+
+  before { ApplicationController.any_instance.stub :current_user }
+
+  describe "GET #index" do
+    it "gets okay" do
+      get "index"
+      response.code.should == "200"
+    end
+  end
+
+  describe "GET #show" do
+    xit "shows stuff" do
+    end
+  end
+
+  describe "GET #edit" do
+    xit "edits" do
+      get "edit"
+    end
+  end
+
+  describe "#update" do
+    xit "updates" do
+    end
+  end
+
+  describe "#destroy" do
+    xit "kills it"
+  end
+end

data/spec/controllers/my_timeline/posts_controller_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe MyTimeline::PostsController do
+  routes { MyTimeline::Engine.routes }
+
+  before { ApplicationController.any_instance.stub :current_user }
+
+  describe "GET #new" do
+    it "news" do
+      get "new"
+      subject.instance_variable_get(:@post).should  be_a MyTimeline::Post
+      subject.instance_variable_get(:@event).should be_a MyTimeline::Event
+    end
+  end
+
+  describe "POST #create" do
+    it "creates the event/post" do
+      post "create", post: {happened_on: Time.now, full_text: "foo", event_attributes: {description: "bar", public: "true"}}
+      MyTimeline::Post.last.should_not be_nil
+      response.should redirect_to root_path
+    end
+  end
+end

data/spec/dummy/config/application.rb

@@ -3,9 +3,13 @@ require File.expand_path('../boot', __FILE__)
 require "active_record/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"
-require "active_resource/railtie"
 require "sprockets/railtie"
 
+begin
+  require "active_resource/railtie"
+rescue LoadError
+end
+
 Bundler.require(*Rails.groups)
 require "my_timeline"
 
@@ -14,7 +18,7 @@ module Dummy
     config.encoding = "utf-8"
     config.filter_parameters += [:password]
     config.active_support.escape_html_entities_in_json = true
-    config.active_record.whitelist_attributes = true
+    config.active_record.whitelist_attributes = true unless rails4?
     config.assets.enabled = true
     config.assets.version = '1.0'
   end

data/spec/dummy/config/environments/development.rb

@@ -7,7 +7,7 @@ Dummy::Application.configure do
   config.cache_classes = false
 
   # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  config.whiny_nils = true unless rails4?
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
@@ -23,11 +23,11 @@ Dummy::Application.configure do
   config.action_dispatch.best_standards_support = :builtin
 
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  config.active_record.mass_assignment_sanitizer = :strict unless rails4?
 
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
+  config.active_record.auto_explain_threshold_in_seconds = 0.5 unless rails4?
 
   # Do not compress assets
   config.assets.compress = false

data/spec/dummy/config/environments/test.rb

@@ -12,7 +12,7 @@ Dummy::Application.configure do
   config.static_cache_control = "public, max-age=3600"
 
   # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
+  config.whiny_nils = true unless rails4?
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
@@ -30,7 +30,7 @@ Dummy::Application.configure do
   config.action_mailer.delivery_method = :test
 
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  config.active_record.mass_assignment_sanitizer = :strict unless rails4?
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr

data/spec/dummy/db/schema.rb

@@ -51,6 +51,5 @@ ActiveRecord::Schema.define(:version => 20131103135539) do
     t.datetime "updated_at",  :null => false
   end
 
-  add_index "my_timeline_settings", ["target_type", "target_id", "var"], :name => "index_my_timeline_settings_on_target_type_and_target_id_and_var", :unique => true
-
+  add_index "my_timeline_settings", ["target_type", "target_id", "var"], :name => "index_my_timeline_settings_on_user", :unique => true
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: my_timeline
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Justin Aiken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-29 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - <
+    - - '>'
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - <
+    - - '>'
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +131,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.markdown
 - Gemfile
 - Guardfile
 - LICENSE
@@ -170,10 +165,13 @@ files:
 - db/migrate/20131103135539_create_my_timeline_posts.rb
 - doc/screenshot.png
 - engine_plan.rb
+- gemfiles/Gemfile.rails-3.x
+- gemfiles/Gemfile.rails-4.x
 - lib/generators/my_timeline/install_generator.rb
 - lib/generators/templates/README
 - lib/generators/templates/my_timeline.rb
 - lib/my_timeline.rb
+- lib/my_timeline/core_ext/rails4.rb
 - lib/my_timeline/engine.rb
 - lib/my_timeline/settings_ext.rb
 - lib/my_timeline/user_stub.rb
@@ -181,6 +179,10 @@ files:
 - lib/tasks/my_timeline_tasks.rake
 - my_timeline.gemspec
 - script/rails
+- spec/controllers/my_timeline/application_controller_spec.rb
+- spec/controllers/my_timeline/control_panel_controller_spec.rb
+- spec/controllers/my_timeline/events_controller_spec.rb
+- spec/controllers/my_timeline/posts_controller_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
@@ -202,7 +204,6 @@ files:
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep

data/spec/dummy/config/locales/en.yml

@@ -1,5 +0,0 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
-en:
-  hello: "Hello world"