flexible_feeds 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 38f307f3b75cd9a484848e2268b3cbf08c99dac3
-  data.tar.gz: 8bd9504bf1642e5e597e1f3a8ecd371f35e1da2f
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTc4OTkwOWJiOTc3N2RlMTMwNGMyOWY0Y2YwN2U2N2Q5ZWQ2MGI1Yw==
+  data.tar.gz: !binary |-
+    ZDI5NTYxYWM3NGY4MGVjMzljOWNmZDJjNzdlOGExY2M5MzUyOWRjMg==
 SHA512:
-  metadata.gz: f7ae27f7602d9fb8af8e59a78baa6f536b4227444f6e50ed2b678075b4c5084546f1553517fc0a01ab3e90081f041fa6823323eab1e8b6e759495097386f46e7
-  data.tar.gz: c8d6a4393750c7eaa9a08c37048706f6aa621f3e8a89ca51ea794ff41198957461d6f6a40e3cf42e3c5f79d40eb2c50c85afbe370db5ae12a463c22036114e4b
+  metadata.gz: !binary |-
+    OGUzNmQzZDQ5Mjk1NTNjNDgzMzlkM2JiMjI0Y2M5NzZhMGRlYWNkOGE3MWIx
+    MGU4YTZlOTBhNzA4NGUxODQ2MDcwM2ZkMWE2NjUxNWFkNjFhNDk1ZmFmZjNl
+    OGNjNmQ2MjJhYjQ1MTkyN2ZhNmRlM2I0ZjdiYTc0NWMyMGQ4ZTg=
+  data.tar.gz: !binary |-
+    MWYxMjU1NGRmMWY1MDgzYmEzYjgyMWFkMjMxN2IyZGVmODJkYmY1ZDVmNWMy
+    ZjRmMzI4NWE4MTM5OGEwZjc1M2Q0NzczOGExODBhYTYxNmZlNDAxNmY4OTYz
+    NWYwNDFiYjMxOGNmZDE3MWRhYmZjNzI3Y2U4ZmFlYTNkYjBjOGI=

data/app/models/flexible_feeds/event.rb

@@ -50,10 +50,7 @@ module FlexibleFeeds
     # Thanks to Evan Miller
     # http://www.evanmiller.org/how-not-to-sort-by-average-rating.html
     def calculate_popularity(pos, n)
-      return 0 if n == 0
-      z = 1.96
-      phat = 1.0*pos/n
-      (phat + z*z/(2*n) - z * Math.sqrt((phat*(1-phat)+z*z/(4*n))/n))/(1+z*z/n)
+      PopularityCalculator.new(pos, n).get_popularity
     end
   end
 end

data/lib/flexible_feeds.rb

@@ -1,11 +1,12 @@
 require "flexible_feeds/engine"
-require "flexible_feeds/acts_as_feedable"
+require "flexible_feeds/flexible_feeds"
 require "flexible_feeds/acts_as_eventable"
 require "flexible_feeds/acts_as_moderator"
 require "flexible_feeds/acts_as_follower"
 require "flexible_feeds/acts_as_parent"
 require "flexible_feeds/acts_as_child"
 require "flexible_feeds/polymorphic_join"
+require "flexible_feeds/popularity_calculator"
 
 module FlexibleFeeds
 end

data/lib/flexible_feeds/acts_as_eventable.rb

@@ -18,6 +18,18 @@ module FlexibleFeeds
 
         cattr_accessor :created_by
         self.created_by = options[:created_by]
+
+        if options[:is_parent] === true
+          acts_as_parent
+        elsif options[:is_parent].present?
+          acts_as_parent options[:is_parent]
+        end
+
+        if options[:is_child] === true
+          acts_as_child
+        elsif options[:is_child].present?
+          acts_as_child options[:is_child]
+        end
       end
     end
 

data/lib/flexible_feeds/{acts_as_feedable.rb → flexible_feeds.rb}

@@ -1,9 +1,9 @@
 module FlexibleFeeds
-  module ActsAsFeedable
+  module HasFlexibleFeed
     extend ActiveSupport::Concern
  
     module ClassMethods
-      def acts_as_feedable(options = {})
+      def flexible_feeds(options = {})
 
         cattr_accessor :has_many_feeds
         self.has_many_feeds = options[:has_many] || false
@@ -29,4 +29,4 @@ module FlexibleFeeds
   end
 end
 
-ActiveRecord::Base.send :include, FlexibleFeeds::ActsAsFeedable
+ActiveRecord::Base.send :include, FlexibleFeeds::HasFlexibleFeed

data/lib/flexible_feeds/polymorphic_join.rb

@@ -6,21 +6,33 @@ module FlexibleFeeds
       def polymorphically_joined_through(join_table, params)
         association = params[:association_name]
         singular_association = params[:singular_association_name]
-        
+        define_association(join_table, association, singular_association)
+        define_include(join_table, association, singular_association)
+        define_add(join_table, association, singular_association)
+        define_remove(join_table, association, singular_association)
+      end
+
+      def define_association(join_table, association, singular_association)
         define_method association do
           send(join_table).collect { |join| join.send(singular_association) }
         end
-        
+      end
+
+      def define_include(join_table, association, singular_association)
         define_method "#{association}_include?".to_sym do |instance|
           send(join_table).where(singular_association => instance).exists?
         end
-        
+      end
+
+      def define_add(join_table, association, singular_association)
         define_method "add_#{singular_association}".to_sym do |instance|
           result = send(join_table).create(singular_association => instance)
           self.reload()
           result
         end
-        
+      end
+
+      def define_remove(join_table, association, singular_association)
         define_method "remove_#{singular_association}".to_sym do |instance|
           return false unless send("#{association}_include?", instance)
           result = send(join_table).

data/lib/flexible_feeds/popularity_calculator.rb

@@ -0,0 +1,37 @@
+module FlexibleFeeds
+  class PopularityCalculator
+    
+    attr_accessor :pos, :n
+    def initialize(pos, n)
+      @pos = pos
+      @n = n
+    end
+
+    def get_popularity
+      return 0 if n == 0
+      dividend / divisor
+    end
+
+    private
+    def z
+      1.96
+    end
+
+    def phat
+      1.0 * pos / n
+    end
+
+    def dividend
+      phat + z*z/(2*n) - z * sqrt
+    end
+
+    def sqrt
+      Math.sqrt((phat*(1-phat)+z*z/(4*n))/n)
+    end
+
+    def divisor
+      1+z*z/n
+    end
+
+  end
+end

data/lib/flexible_feeds/version.rb

@@ -1,3 +1,3 @@
 module FlexibleFeeds
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flexible_feeds
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - timothycommoner
@@ -28,112 +28,112 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-spork
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A flexible feed system, allowing for everything from automated events
@@ -144,39 +144,40 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.rdoc
+- Rakefile
+- app/assets/javascripts/flexible_feeds/application.js
+- app/assets/stylesheets/flexible_feeds/application.css
+- app/controllers/flexible_feeds/application_controller.rb
 - app/helpers/flexible_feeds/application_helper.rb
-- app/models/flexible_feeds/moderator_join.rb
-- app/models/flexible_feeds/vote.rb
 - app/models/flexible_feeds/event.rb
 - app/models/flexible_feeds/event_join.rb
 - app/models/flexible_feeds/feed.rb
 - app/models/flexible_feeds/follow.rb
-- app/controllers/flexible_feeds/application_controller.rb
-- app/assets/javascripts/flexible_feeds/application.js
-- app/assets/stylesheets/flexible_feeds/application.css
+- app/models/flexible_feeds/moderator_join.rb
+- app/models/flexible_feeds/vote.rb
 - app/views/layouts/flexible_feeds/application.html.erb
-- config/routes.rb
 - config/locales/en.yml
-- db/migrate/20140227195107_create_flexible_feeds_follows.rb
+- config/routes.rb
+- db/migrate/20140227194731_create_flexible_feeds_feeds.rb
 - db/migrate/20140227194816_create_flexible_feeds_events.rb
-- db/migrate/20140227195044_create_flexible_feeds_moderator_joins.rb
 - db/migrate/20140227194904_create_flexible_feeds_event_joins.rb
+- db/migrate/20140227195044_create_flexible_feeds_moderator_joins.rb
+- db/migrate/20140227195107_create_flexible_feeds_follows.rb
 - db/migrate/20140227195140_create_flexible_feeds_votes.rb
-- db/migrate/20140227194731_create_flexible_feeds_feeds.rb
-- lib/tasks/flexible_feeds_tasks.rake
+- lib/flexible_feeds.rb
+- lib/flexible_feeds/acts_as_child.rb
 - lib/flexible_feeds/acts_as_eventable.rb
-- lib/flexible_feeds/acts_as_moderator.rb
 - lib/flexible_feeds/acts_as_follower.rb
-- lib/flexible_feeds/polymorphic_join.rb
-- lib/flexible_feeds/acts_as_feedable.rb
-- lib/flexible_feeds/version.rb
+- lib/flexible_feeds/acts_as_moderator.rb
 - lib/flexible_feeds/acts_as_parent.rb
-- lib/flexible_feeds/acts_as_child.rb
 - lib/flexible_feeds/engine.rb
-- lib/flexible_feeds.rb
-- MIT-LICENSE
-- Rakefile
-- README.rdoc
+- lib/flexible_feeds/flexible_feeds.rb
+- lib/flexible_feeds/polymorphic_join.rb
+- lib/flexible_feeds/popularity_calculator.rb
+- lib/flexible_feeds/version.rb
+- lib/tasks/flexible_feeds_tasks.rake
 homepage: https://github.com/timothycommoner/flexible_feeds
 licenses: []
 metadata: {}
@@ -186,17 +187,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A flexible feed system.