my_timeline 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b1e4e734b8ba08d97b8c8b37940ce764ddc25a7
-  data.tar.gz: ec08da26e73fbcecd5fc7ea2259b3428bf272b0f
+  metadata.gz: c900ff1d59717d4d8b507507360f9a0acb785387
+  data.tar.gz: ded000abf734348cd2fbf1938f66e3122424aa75
 SHA512:
-  metadata.gz: 84358a06da83329cc1800936b42361c81093f4a616272616c9b74f5a90f131318ad45ce4517e2b018eb44702e61535ac83b0bb6043610fbed0d30dbf88ad92ab
-  data.tar.gz: 8a55367c195632241c959e9efc07ad11b327f5e895b36fc3c3362a71fca778a02843053fdafafffca6ef47f67498610a337e11cef6a7dafc62e066fa1e5eedb0
+  metadata.gz: fbef9bb8f0e43e3c60bdd4ff17b4789c47c27c83c54c8f85fc5fd043377b651b8a75e332eecf9c715827daec21952d6c682253f149cc0cc49e197ed3681a0798
+  data.tar.gz: 04f35066cd299b80460f6f80de144f2f6e689d84c57fab2d45c05aa26842177f512da9b899474a667de58c6960fb35817c9238899e1fe2e7bc4cc448ff048613

data/CHANGELOG.markdown

@@ -1,3 +1,9 @@
+# 0.1.0
+  * [BUGFIX] Fix the settings to reload in development mode
+  * [BUGFIX] Fix the user stub
+  * [FEATURE] Display event's times with the User's timezone, and make the time formatting configurable
+  * [BUGFIX] Make the plugin registry a Set instead of an Array to avoid duplicates
+
 # 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

data/app/controllers/my_timeline/control_panel_controller.rb

@@ -9,7 +9,7 @@ module MyTimeline
       if rails4?
         @user.time_zone = user_params[:time_zone]
       else
-        @user.time_zone = params[:user][:time_zone]
+        @user.time_zone = params[user_param][:time_zone]
       end
 
       @user.save!
@@ -20,8 +20,12 @@ module MyTimeline
 
     if rails4?
       define_method :user_params do
-        params.required(:user).permit :time_zone
+        params.required(user_param).permit :time_zone
       end
     end
+
+    def user_param
+      MyTimeline.user_class.model_name.param_key.to_sym
+    end
   end
 end

data/app/presenters/my_timeline/event_presenter.rb

@@ -12,13 +12,30 @@ module MyTimeline
     end
 
     def happened_on
-      event.happened_on.strftime("%-l:%M %P")
+      time.strftime MyTimeline.time_formatter
     end
 
     def id
       event.id
     end
 
+  private
+
+    def time
+      return event.happened_on if event.linkable.class.respond_to? :keep_original_time_zone?
+      return event.happened_on unless user.time_zone.present?
+
+      event.happened_on.in_time_zone user.time_zone
+    end
+
+    def user
+      if MyTimeline.user_class == MyTimeline::UserStub
+        MyTimeline::UserStub
+      else
+        event.user
+      end
+    end
+
     def method_missing(meth, *args, &blk)
       if event.respond_to?(meth)
         event.send meth, *args

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

@@ -7,7 +7,7 @@
   <%= link_to event.external_link do %>
   <%= image_tag event.icon_path, size: "32x32" %>
 <% end %>
-<%= event.happened_on %> -
+<%= event.happened_on %>
 <%= raw event.description %>
 <% if @owner_viewing %>
   <%= link_to edit_event_path(event.id) do %>

data/lib/generators/templates/my_timeline.rb

@@ -13,4 +13,7 @@ MyTimeline.setup do |config|
 
   # What classes to style the table with
   # config.table_class = "table table-striped"
+
+  # How to format the time of the event; default looks like "3:33 pm - "
+  # config.time_formatter = %-l:%M %P - "
 end

data/lib/my_timeline.rb

@@ -5,7 +5,7 @@ require "my_timeline/engine"
 
 module MyTimeline
 
-  mattr_accessor :user_class, :user_slug, :render_method, :table_class, :config_object, :enabled_plugins
+  mattr_accessor :user_class, :user_slug, :render_method, :table_class, :config_object, :enabled_plugins, :time_formatter
 
   @@user_class = 'MyTimeline::UserStub'
   def self.user_class
@@ -19,8 +19,11 @@ module MyTimeline
 
   @@table_class = "table table-striped"
 
-  @@enabled_plugins = []
-  def self.register_plugin(plugin_name)
+  @@time_formatter = "%-l:%M %P - "
+
+  @@enabled_plugins = Set.new
+  def self.register_plugin(plugin_name, options = {})
+    MyTimeline.config_object.key plugin_name, options
     @@enabled_plugins << plugin_name
   end
 

data/lib/my_timeline/engine.rb

@@ -3,7 +3,6 @@ require 'my_timeline/core_ext/rails4'
 
 module MyTimeline
   class Engine < ::Rails::Engine
-    include SettingsExt
 
     isolate_namespace MyTimeline
 
@@ -18,7 +17,11 @@ module MyTimeline
     end
 
     config.after_initialize do |app|
-      extend_rails_settings
+      MyTimeline::SettingsExt.extend_rails_settings
     end
+
+    config.to_prepare do |app|
+      MyTimeline::SettingsExt.extend_rails_settings
+    end if Rails.env.development?
   end
 end

data/lib/my_timeline/settings_ext.rb

@@ -2,7 +2,7 @@ require 'rails-settings'
 
 module MyTimeline
   module SettingsExt
-    def extend_rails_settings
+    def self.extend_rails_settings
 
       RailsSettings::SettingObject.class_eval do
         self.table_name = "my_timeline_settings"
@@ -35,3 +35,4 @@ module MyTimeline
     end
   end
 end
+

data/lib/my_timeline/user_stub.rb

@@ -1,38 +1,50 @@
+require 'singleton'
+
 module MyTimeline
   class UserStub
+    include Singleton
+
+    include ActiveModel::Validations
+    include ActiveModel::Conversion
+    extend ActiveModel::Naming
 
-    def self.events
+    def events
       Event
     end
 
-    def self.settings
-      RailsSettings::SettingObject
+    def settings(var = :core)
+      RailsSettings::SettingObject.find_by_var var
     end
 
-    def self.id
+    def id
       nil
     end
 
-    def self.save!
+    def save!
       true
     end
 
+    def persisted?
+      false
+    end
+
     def self.method_missing(meth, *args, &blk)
       if meth.to_s =~ /^find_by/
         UserStub
       else
-        super
+        instance.send meth, *args, &blk
+        # super
       end
     end
 
     def self.settings_attr_accessor(*args)
       args.each do |method_name|
         eval "
-          def #{method_name}
-            self.settings(:core).send(:#{method_name})
+          def self.#{method_name.to_s}
+            RailsSettings::SettingObject.find_by_var(:core).send('#{method_name}')
           end
-          def #{method_name}=(value)
-            self.settings(:core).send(:#{method_name}=, value)
+          def self.#{method_name.to_s}=(value)
+            RailsSettings::SettingObject.find_by_var(:core).send('#{method_name}=', value)
           end
         "
       end

data/lib/my_timeline/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_timeline
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Justin Aiken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails