my_timeline 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 180963925c947c23df9af5971da60bee552c0a8a
-  data.tar.gz: 7c1c93ed23f8eb0042a49fc1980bf0983d8156aa
+  metadata.gz: 3b1e4e734b8ba08d97b8c8b37940ce764ddc25a7
+  data.tar.gz: ec08da26e73fbcecd5fc7ea2259b3428bf272b0f
 SHA512:
-  metadata.gz: 7772eed0229ad702ca03290f9e86755eb0eee82df4a78463f119f55be92f654b4e7ee9fd9977d809aa627d19bc666714795eec9cdf91a0c0064edb58fb0d5c9e
-  data.tar.gz: 3586a2d72d86d44d9dea55a77956db5a7f8d6ef288f5861031a3d9495bf308f3470b18f22a4a29d1debfa0ed2084e2272ff4ef413eadb35a06da48a157cc03ab
+  metadata.gz: 84358a06da83329cc1800936b42361c81093f4a616272616c9b74f5a90f131318ad45ce4517e2b018eb44702e61535ac83b0bb6043610fbed0d30dbf88ad92ab
+  data.tar.gz: 8a55367c195632241c959e9efc07ad11b327f5e895b36fc3c3362a71fca778a02843053fdafafffca6ef47f67498610a337e11cef6a7dafc62e066fa1e5eedb0

data/CHANGELOG.markdown

@@ -1,9 +1,13 @@
+# 0.0.5
+  * [FEATURE] Added a detail view that expands below the summary post, if that model supports an expandable view (defaults to not.)
+  * [BUGFIX] Dehardcode header text
+
 # 0.0.4
-  * Added Rails 4 compatibility
-  * Added more tests
+  * [FEATURE] Added Rails 4 compatibility
+  * [FEATURE] Added more tests
 
 # 0.0.3
-  * Fixed external event link
+  * [BUGFIX] Fixed external event link
 
 # 0.0.2
   * Many, many bugfixes

data/app/assets/javascripts/my_timeline/events.js.coffee

@@ -0,0 +1,22 @@
+$ ->
+  $("a.event_expand").click (event) ->
+    event.preventDefault()
+
+    event_id = $(this).attr("id").replace /[A-Z_a-z$-]/g, ""
+    div_id   = "div#event_" + event_id
+    url      = $("span#event_url_" + event_id).text()
+
+    if $(div_id).css('display') == 'none'
+      $.ajax url,
+        type: 'GET'
+        dataType: 'html'
+        error: (jqXHR, textStatus, errorThrown) ->
+          $(div_id).html errorThrown
+          $(div_id).toggle()
+
+        success: (data, textStatus, jqXHR) ->
+          $(div_id).html data
+          $(div_id).toggle()
+    else
+      $(div_id).toggle()
+

data/app/controllers/my_timeline/control_panel_controller.rb

@@ -4,5 +4,24 @@ module MyTimeline
     def index
       @enabled_plugins = MyTimeline.enabled_plugins
     end
+
+    def timezone
+      if rails4?
+        @user.time_zone = user_params[:time_zone]
+      else
+        @user.time_zone = params[:user][:time_zone]
+      end
+
+      @user.save!
+      redirect_to :back, notice: "Time zone setting saved."
+    end
+
+  private
+
+    if rails4?
+      define_method :user_params do
+        params.required(:user).permit :time_zone
+      end
+    end
   end
 end

data/app/controllers/my_timeline/events_controller.rb

@@ -19,11 +19,11 @@ module MyTimeline
     end
 
     def edit
-      @event = Event.find_by_id(params[:id])
+      @event = Event.find_by_id params[:id]
     end
 
     def update
-      @event = Event.find_by_id(params[:id])
+      @event = Event.find_by_id params[:id]
       if @event.update_attributes(rails4? ? event_params : params[:event])
         redirect_to root_path, notice: "Edit successful."
       else

data/app/controllers/my_timeline/posts_controller.rb

@@ -23,6 +23,11 @@ module MyTimeline
       end
     end
 
+    def show
+      @post = Post.find_by_id params[:id]
+      render text: @post.full_text
+    end
+
   private
 
     if rails4?

data/app/models/my_timeline/post.rb

@@ -12,5 +12,9 @@ module MyTimeline
     validates :full_text, presence: true
 
     accepts_nested_attributes_for :event
+
+    def self.is_exandable?
+      true
+    end
   end
 end

data/app/views/my_timeline/control_panel/_time_zone.html.erb

@@ -0,0 +1,5 @@
+<%= form_for @user, url: control_panel_timezone_path, method: :post do |f| %>
+  <%= f.time_zone_select :time_zone %>
+  <br>
+  <%= f.submit 'Save', class: "btn btn-primary" %>
+<% end %>

data/app/views/my_timeline/control_panel/index.html.erb

@@ -2,8 +2,16 @@
   <h1><%= I18n.t("my_timeline.control_panel.header") %></h1>
 </div>
 
+<div>
+  <h3>My Settings</h2>
+  <%= render partial: "my_timeline/control_panel/time_zone" %>
+</div>
+
+<hr>
+
 <% @enabled_plugins.each do |plug| %>
   <%= render partial: "my_timeline/#{plug}/control_panel" %>
+  <hr>
 <% end %>
 
 <h3> New Post </h3>

data/app/views/my_timeline/events/_event.html.erb

@@ -1,6 +1,10 @@
 <p>
-<%= link_to event.external_link do %>
-  <%= glyph 'plus-sign' %>
+  <% if event.linkable.class.respond_to? :is_exandable? %>
+    <%= link_to "#", class: "event_expand", id: "event_#{event.id}" do %>
+      <%= glyph 'plus-sign' %>
+    <% end %>
+  <% end %>
+  <%= link_to event.external_link do %>
   <%= image_tag event.icon_path, size: "32x32" %>
 <% end %>
 <%= event.happened_on %> -
@@ -14,3 +18,10 @@
   <% end %>
 <% end %>
 </p>
+<% if event.linkable.class.respond_to? :is_exandable? %>
+  <div class="event_details" id="event_<%= event.id %>" style="display:none;">
+  </div>
+  <span class="event_url" id="event_url_<%= event.id %>" style="display:none;">
+    <%= polymorphic_url [my_timeline, event.linkable] %>
+  </span>
+<% end %>

data/app/views/my_timeline/events/index.html.erb

@@ -1,6 +1,10 @@
-<div class="page-header">
-  <small>A demonstration timeline</small>
-</div>
+<%= javascript_include_tag "my_timeline/events" %>
+
+<% if t "my_timeline.timeline_header", default: nil %>
+  <div class="page-header">
+    <small><%= t "my_timeline.timeline_header" %></small>
+  </div>
+<% end %>
 
 <% @dates_with_events.each do |day| %>
   <h4><%= date_header_string day[:date] %></h4>

data/config/locales/en.yml

@@ -1,5 +1,5 @@
 en:
   my_timeline:
-    timeline_header: Timeline
+    timeline_header: A demonstration timeline
     control_panel:
       header: Control Panel

data/config/routes.rb

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

data/lib/my_timeline/settings_ext.rb

@@ -8,15 +8,28 @@ module MyTimeline
         self.table_name = "my_timeline_settings"
 
         MyTimeline.config_object = ::RailsSettings::Configuration.new(MyTimeline.user_class) do |s|
-          s.key :empty_placeholder
+          s.key :core
         end
 
         MyTimeline.user_class.class_eval do
           self.send :include, ::RailsSettings::Base
           self.send :extend,  ::RailsSettings::Scopes
 
-          MyTimeline.config_object.key :twitter, defaults: {foo: "bar"}
-          MyTimeline.config_object.key :github, defaults: {foo: "bar"}
+          def self.settings_attr_accessor(*args)
+            args.each do |method_name|
+              eval "
+                def #{method_name}
+                  self.settings(:core).send(:#{method_name})
+                end
+                def #{method_name}=(value)
+                  self.settings(:core).send(:#{method_name}=, value)
+                end
+              "
+            end
+          end
+
+          settings_attr_accessor :time_zone
+
         end unless MyTimeline.user_class == MyTimeline::UserStub
       end
     end

data/lib/my_timeline/user_stub.rb

@@ -1,5 +1,6 @@
 module MyTimeline
   class UserStub
+
     def self.events
       Event
     end
@@ -23,5 +24,20 @@ module MyTimeline
         super
       end
     end
+
+    def self.settings_attr_accessor(*args)
+      args.each do |method_name|
+        eval "
+          def #{method_name}
+            self.settings(:core).send(:#{method_name})
+          end
+          def #{method_name}=(value)
+            self.settings(:core).send(:#{method_name}=, value)
+          end
+        "
+      end
+    end
+
+    settings_attr_accessor :time_zone
   end
 end

data/lib/my_timeline/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_timeline
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Justin Aiken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -139,7 +139,7 @@ files:
 - Rakefile
 - app/assets/images/my_timeline/.gitkeep
 - app/assets/images/my_timeline/icons/notes.png
-- app/assets/javascripts/my_timeline/application.js
+- app/assets/javascripts/my_timeline/events.js.coffee
 - app/assets/stylesheets/my_timeline/application.css
 - app/controllers/my_timeline/application_controller.rb
 - app/controllers/my_timeline/control_panel_controller.rb
@@ -150,6 +150,7 @@ files:
 - app/models/my_timeline/event.rb
 - app/models/my_timeline/post.rb
 - app/presenters/my_timeline/event_presenter.rb
+- app/views/my_timeline/control_panel/_time_zone.html.erb
 - app/views/my_timeline/control_panel/index.html.erb
 - app/views/my_timeline/events/_day_with_events_list.html.erb
 - app/views/my_timeline/events/_day_with_events_table.html.erb

data/app/assets/javascripts/my_timeline/application.js

@@ -1,15 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
-//
-//= require jquery
-//= require jquery_ujs
-//= require_tree .