bfriend 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 622e58967a1a4efcec7f98f6e09d07b32870dca5
-  data.tar.gz: 7bf237f63837034e035fa657b49a8e1e55fe0519
+  metadata.gz: 6ffc6af4bea6eb13f40601754e7eb1b91911ac6d
+  data.tar.gz: f3d9c7e662c2844a9b006eb6a81b31c7a191b35c
 SHA512:
-  metadata.gz: 62ad98686710315b30cc7b1ba61519545cafc919251145af521e1e512b53d536a9e3cc680446671dc36f1ae9d4cae2240c868c69de50153b925972211bdeb7fb
-  data.tar.gz: 1be1b815d8930aff9056de13e4eb0f5e41d7c451aa692b2673a73400bedb5c5c23c403f077bb0453393dac7335d870bd244125986b1dc490d283c80a32de6465
+  metadata.gz: 66defefd24e69a79d99c414cbc0f05dc37b8dd0f864af5a4832457e3553b49293ae34e2daa1976c90959d1f49295efe74fee94d46846df5a0ef6913270de7c11
+  data.tar.gz: 8a446320e214177cfcbd004b0ae643f173d04ca7dfeb5292915ed623eee56eb6254e3601be5ce8fa356ee13def144c53a902462835ef87849cc00f2246856330

data/README.md

@@ -21,9 +21,9 @@ Or install it yourself as:
 
 ## Usage
 
-Run the bfriend generator `rails g bfriend -t --api`. This will generate a friendship model, a migration, add routes & associations to your user model and generate a friendship controller suitable for use in an API.
+Run the bfriend generator `rails g bfriend`. This will generate a friendship model, a migration, add routes & associations to your user model and generate a friendship controller suitable for use in an API.
 
-If you are using  the gem for a ruby on rails project, run `rails g bfriend -t --ror` .
+If you are using the gem for a ruby on rails project, run `rails g bfriend --ror` .
 
 Edit the migration to give the status a default of false 
 
@@ -47,6 +47,8 @@ Now you can:
 
 At this time no view templates are created and I will update this readme when and if I add them.
  
+### Upgrading to >=  0.8.0
+The class methods have been moved to the bfriend module of the gem so you will need to remove them from your user model and add `include Bfriend`
 
 ## Contributing
 

data/bfriend.gemspec

@@ -6,8 +6,8 @@ require "bfriend/version"
 Gem::Specification.new do |spec|
   spec.name          = "bfriend"
   spec.version       = Bfriend::VERSION
-  spec.authors       = ["xfinger"]
-  spec.email         = ["xfinger@gmail.com"]
+  spec.authors       = "xfinger"
+  spec.email         = "xfinger@gmail.com"
 
   spec.summary       = %q{A simple friendship model}
   spec.description   = %q{Based on Railscasts #163 Self-Referential Association}
@@ -26,9 +26,11 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
+  
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ["lib","lib/generators"]
+  spec.required_ruby_version = ">= 2.0.0"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/bfriend.rb

@@ -1,5 +1,24 @@
-require "bfriend/version"
 
 module Bfriend
-
+    def self.included(base)
+        base.class_eval do 
+            has_many :friendships
+            has_many :bfriended_friendships, class_name: "Friendship", foreign_key: "friend_id"
+            # bfriended by user
+            has_many :current_friends,       -> { where(friendships: { status: true}) }, through: :friendships, source: :friend
+            # bfriended by friend
+            has_many :bfriended_friends,     -> { where(friendships: { status: true}) }, through: :bfriended_friendships, source: :user                # requested by friend
+            has_many :requested_friends,     -> { where(friendships: { status: false}) }, through: :bfriended_friendships, source: :user 
+            # requested by user
+            has_many :pending_friends,       -> { where(friendships: { status: false}) }, through: :friendships, source: :friend
+        end
+        # combine the sets to see all your friends
+        def friends
+            current_friends | bfriended_friends
+        end
+        # combine the sets to see pending and requested friendships
+        def pending
+            pending_friends | requested_friends
+        end 
+    end
 end

data/lib/bfriend/version.rb

@@ -1,5 +1,5 @@
 require "bfriend/version"
 
 module Bfriend
-  VERSION = "0.7.3"
+  VERSION = "0.8.0"
 end

data/lib/generators/bfriend/bfriend_generator.rb

@@ -5,7 +5,8 @@ require 'rails/generators/active_record'
 class BfriendGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
   include Rails::Generators::Migration
-  class_option :controller_template, :type => :string, :aliases => "-t", :desc => "Template engine for the Controller. Available options are 'api' and 'ror'.", :default => "api"
+
+  class_option :controller_template, :type => :string, :desc => "Template engine for the Controller. Available options are 'api' and 'ror'.", :default => "api"
   class_option :ror, :type => :boolean, :default => false
       
       
@@ -22,34 +23,8 @@ class BfriendGenerator < Rails::Generators::Base
 
 
   def add_to_user
-   inject_into_file 'app/models/user.rb', before: "end"  do  
-        "
-         has_many :friendships
-         has_many :bfriended_friendships, :class_name => \"Friendship\", :foreign_key => \"friend_id\"
-
-         # bfriended by user
-         has_many :current_friends,       -> { where(friendships: { status: true}) }, through: :friendships, source: :friend
-         # bfriended by friend
-	       has_many :bfriended_friends,     -> { where(friendships: { status: true}) }, through: :bfriended_friendships, source: :user
-         # requested by friend
-	       has_many :requested_friends, -> { where(friendships: { status: false}) }, through: :bfriended_friendships, source: :user 
-         # requested by user
-         has_many :pending_friends,       -> { where(friendships: { status: false}) }, through: :friendships, source: :friend
-         \n
-        
-         # combine the sets to see all your friends
-      	 def friends
-	          current_friends | bfriended_friends
-	       end
-
-         # combine the sets to see pending and requested friendships
-         def pending
-		       pending_friends | requested_friends
-	       end
-        
-         \n 
-        "
-       
+    inject_into_file 'app/models/user.rb', before: "end"  do  
+      "include Bfriend\n"   
     end
   end
     
@@ -65,5 +40,7 @@ class BfriendGenerator < Rails::Generators::Base
   def generate_migration #after generating the migration, add 'default: false' to status
     generate "migration", "create_friendships user_id:integer friend_id:integer status:boolean "
   end
+
+
    
 end

data/lib/generators/bfriend/templates/model.rb

@@ -1,8 +1,5 @@
 
-class Friendship < ApplicationRecord
-  
+class Friendship < ApplicationRecord  
   belongs_to :user
   belongs_to :friend, :class_name => 'User'
-
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfriend
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - xfinger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,12 +39,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 description: 'Based on Railscasts #163 Self-Referential Association'
-email:
-- xfinger@gmail.com
+email: xfinger@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".DS_Store"
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
@@ -59,7 +59,6 @@ files:
 - lib/generators/bfriend/templates/api_controller.rb
 - lib/generators/bfriend/templates/model.rb
 - lib/generators/bfriend/templates/ror_controller.rb
-- lib/generators/bfriend/tmp.rb
 homepage: https://github.com/XFinger/bfriend
 licenses:
 - MIT
@@ -69,11 +68,12 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- lib/generators
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/generators/bfriend/tmp.rb

@@ -1,15 +0,0 @@
-	has_many :friendships
-	has_many :received_friendships, class_name: "Friendship", foreign_key: "friend_id"
-
-	has_many :active_friends, -> { where(friendships: { accepted: true}) }, through: :friendships, source: :friend
-	has_many :received_friends, -> { where(friendships: { accepted: true}) }, through: :received_friendships, source: :user
-	has_many :pending_friends, -> { where(friendships: { accepted: false}) }, through: :friendships, source: :friend
-	has_many :requested_friendships, -> { where(friendships: { accepted: false}) }, through: :received_friendships, source: :user
-
-	def friends
-	  active_friends | received_friends
-	end
-
-	def pending
-		pending_friends | requested_friendships
-	end