puffs 0.2.04 → 0.2.05

data/lib/sql_object/associatable.rb

@@ -1,97 +1,99 @@
 require 'active_support/inflector'
 
-class AssocOptions
-  attr_accessor(
-    :foreign_key,
-    :class_name,
-    :primary_key
-  )
-
-  def model_class
-    class_name.constantize
-  end
+module Puffs
+  class AssocOptions
+    attr_accessor(
+      :foreign_key,
+      :class_name,
+      :primary_key
+    )
+
+    def model_class
+      class_name.constantize
+    end
 
-  def table_name
-    model_class.table_name
+    def table_name
+      model_class.table_name
+    end
   end
-end
 
-class BelongsToOptions < AssocOptions
-  def initialize(name, options = {})
-    @primary_key = options[:primary_key] || :id
-    @foreign_key = options[:foreign_key] || "#{name}_id".to_sym
-    @class_name = options[:class_name] || name.to_s.capitalize
+  class BelongsToOptions < AssocOptions
+    def initialize(name, options = {})
+      @primary_key = options[:primary_key] || :id
+      @foreign_key = options[:foreign_key] || "#{name}_id".to_sym
+      @class_name = options[:class_name] || name.to_s.capitalize
+    end
   end
-end
 
-class HasManyOptions < AssocOptions
-  def initialize(name, self_class_name, options = {})
-    @primary_key = options[:primary_key] || :id
-    @foreign_key = options[:foreign_key] || "#{self_class_name.to_s.underscore}_id".to_sym
-    @class_name = options[:class_name] || name.to_s.singularize.camelcase
+  class HasManyOptions < AssocOptions
+    def initialize(name, self_class_name, options = {})
+      @primary_key = options[:primary_key] || :id
+      @foreign_key = options[:foreign_key] || "#{self_class_name.to_s.underscore}_id".to_sym
+      @class_name = options[:class_name] || name.to_s.singularize.camelcase
+    end
   end
-end
 
-module Associatable
-  def belongs_to(name, options = {})
-    options = BelongsToOptions.new(name, options)
-    assoc_options[name] = options
+  module Associatable
+    def belongs_to(name, options = {})
+      options = BelongsToOptions.new(name, options)
+      assoc_options[name] = options
 
-    define_method(name) do
-      foreign_key_value = self.send(options.foreign_key)
-      return nil if foreign_key_value.nil?
+      define_method(name) do
+        foreign_key_value = self.send(options.foreign_key)
+        return nil if foreign_key_value.nil?
 
-      options.model_class
-             .where(options.primary_key => foreign_key_value)
-             .first
+        options.model_class
+               .where(options.primary_key => foreign_key_value)
+               .first
+      end
     end
-  end
 
-  def has_many(name, options = {})
-    options = HasManyOptions.new(name, self.to_s, options)
-    assoc_options[name] = options
-
-    define_method(name) do
-      target_key_value = self.send(options.primary_key)
-      return nil if target_key_value.nil?
-      options.model_class
-             .where(options.foreign_key => target_key_value)
-             .to_a
+    def has_many(name, options = {})
+      options = HasManyOptions.new(name, self.to_s, options)
+      assoc_options[name] = options
+
+      define_method(name) do
+        target_key_value = self.send(options.primary_key)
+        return nil if target_key_value.nil?
+        options.model_class
+               .where(options.foreign_key => target_key_value)
+               .to_a
+      end
     end
-  end
 
-  def assoc_options
-    @assoc_options ||= {}
-  end
+    def assoc_options
+      @assoc_options ||= {}
+    end
 
-  def has_one_through(name, through_name, source_name)
-    through_options = assoc_options[through_name]
+    def has_one_through(name, through_name, source_name)
+      through_options = assoc_options[through_name]
 
-    define_method(name) do
-      source_options =
-        through_options.model_class.assoc_options[source_name]
-      through_pk = through_options.primary_key
-      key_val = self.send(through_options.foreign_key)
+      define_method(name) do
+        source_options =
+          through_options.model_class.assoc_options[source_name]
+        through_pk = through_options.primary_key
+        key_val = self.send(through_options.foreign_key)
 
-      source_options.model_class.includes(through_options.model_class)
-                                .where(through_pk => key_val).first
+        source_options.model_class.includes(through_options.model_class)
+                                  .where(through_pk => key_val).first
+      end
     end
-  end
 
-  def has_many_through(name, through_name, source_name)
-    through_options = assoc_options[through_name]
-    define_method(name) do
-      through_fk = through_options.foreign_key
-      through_class = through_options.model_class
-      key_val = self.send(through_options.primary_key)
-
-      #2 queries, we could reduce to 1 by writing Puffs::SQLRelation.join.
-      through_class.where(through_fk => key_val)
-                   .includes(source_name)
-                   .load
-                   .included_relations
-                   .first
-                   .to_a
+    def has_many_through(name, through_name, source_name)
+      through_options = assoc_options[through_name]
+      define_method(name) do
+        through_fk = through_options.foreign_key
+        through_class = through_options.model_class
+        key_val = self.send(through_options.primary_key)
+
+        #2 queries, we could reduce to 1 by writing Puffs::SQLRelation.join.
+        through_class.where(through_fk => key_val)
+                     .includes(source_name)
+                     .load
+                     .included_relations
+                     .first
+                     .to_a
+      end
     end
   end
 end

data/lib/sql_object/sql_object.rb

@@ -4,154 +4,155 @@ require_relative '../relation'
 require 'active_support/inflector'
 # require_relative '../puffs'
 
-class Puffs::SQLObject
-  extend Associatable
+module Puffs
+  class SQLObject
+    extend Associatable
 
-  RELATION_METHODS = [
-    :limit, :includes, :where, :order
-  ]
+    RELATION_METHODS = [
+      :limit, :includes, :where, :order
+    ]
 
-  RELATION_METHODS.each do |method|
-    define_singleton_method(method) do |arg|
-      Puffs::SQLRelation.new(klass: self).send(method, arg)
+    RELATION_METHODS.each do |method|
+      define_singleton_method(method) do |arg|
+        Puffs::SQLRelation.new(klass: self).send(method, arg)
+      end
     end
-  end
-
-  def self.all
-    where({})
-  end
 
-  def self.columns
-    DBConnection.columns(table_name)
-  end
+    def self.all
+      where({})
+    end
 
-  def self.count
-    all.count
-  end
+    def self.columns
+      Puffs::DBConnection.columns(table_name)
+    end
 
-  def self.define_singleton_method_by_proc(obj, name, block)
-    metaclass = class << obj; self; end
-    metaclass.send(:define_method, name, block)
-  end
+    def self.count
+      all.count
+    end
 
-  def self.destroy_all!
-    self.all.each do |entry|
-      entry.destroy!
+    def self.define_singleton_method_by_proc(obj, name, block)
+      metaclass = class << obj; self; end
+      metaclass.send(:define_method, name, block)
     end
-  end
 
-  def self.finalize!
-    self.columns.each do |column|
-      define_method(column) do
-        attributes[column]
+    def self.destroy_all!
+      self.all.each do |entry|
+        entry.destroy!
       end
+    end
 
-      define_method("#{column}=") do |new_value|
-        attributes[column] = new_value
+    def self.finalize!
+      self.columns.each do |column|
+        define_method(column) do
+          attributes[column]
+        end
+
+        define_method("#{column}=") do |new_value|
+          attributes[column] = new_value
+        end
       end
     end
-  end
 
-  def self.find(id)
-    where(id: id).first
-  end
+    def self.find(id)
+      where(id: id).first
+    end
 
-  def self.first
-    all.limit(1).first
-  end
+    def self.first
+      all.limit(1).first
+    end
 
-  def self.has_association?(association)
-    assoc_options.keys.include?(association)
-  end
+    def self.has_association?(association)
+      assoc_options.keys.include?(association)
+    end
 
-  def self.last
-    all.order(id: :desc).limit(1).first
-  end
+    def self.last
+      all.order(id: :desc).limit(1).first
+    end
+
+    def self.parse_all(results)
+      relation = Puffs::SQLRelation.new(klass: self, loaded: true)
+      results.each do |result|
+        relation << self.new(result)
+      end
 
-  def self.parse_all(results)
-    relation = Puffs::SQLRelation.new(klass: self, loaded: true)
-    results.each do |result|
-      relation << self.new(result)
+      relation
     end
 
-    relation
-  end
+    def self.table_name=(table_name)
+      @table_name = table_name
+    end
 
-  def self.table_name=(table_name)
-    @table_name = table_name
-  end
+    def self.table_name
+      @table_name ||= self.to_s.downcase.tableize
+    end
 
-  def self.table_name
-    @table_name ||= self.to_s.downcase.tableize
-  end
+    def initialize(params = {})
+      params.each do |attr_name, value|
+        unless self.class.columns.include?(attr_name.to_sym)
+          raise "unknown attribute '#{attr_name}'"
+        end
 
-  def initialize(params = {})
-    params.each do |attr_name, value|
-      unless self.class.columns.include?(attr_name.to_sym)
-        raise "unknown attribute '#{attr_name}'"
+        self.send("#{attr_name}=", value)
       end
+    end
 
-      self.send("#{attr_name}=", value)
+    def attributes
+      @attributes ||= {}
     end
-  end
 
-  def attributes
-    @attributes ||= {}
-  end
+    def attribute_values
+      self.class.columns.map do |column|
+        self.send(column)
+      end
+    end
 
-  def attribute_values
-    self.class.columns.map do |column|
-      self.send(column)
+    def destroy!
+      if self.class.find(id)
+        Puffs::DBConnection.execute(<<-SQL)
+          DELETE
+          FROM
+            #{self.class.table_name}
+          WHERE
+            id = #{id}
+        SQL
+        return self
+      end
     end
-  end
 
-  def destroy!
-    if self.class.find(id)
-      DBConnection.execute(<<-SQL)
-        DELETE
-        FROM
-          #{self.class.table_name}
-        WHERE
-          id = #{id}
+    def insert
+      columns = self.class.columns.reject { |col| col == :id }
+      column_values = columns.map {|attr_name| send(attr_name)}
+      column_names = columns.join(", ")
+      bind_params = (1..columns.length).map {|n| "$#{n}"}.join(", ")
+      result = Puffs::DBConnection.execute(<<-SQL, column_values)
+        INSERT INTO
+          #{self.class.table_name} (#{column_names})
+        VALUES
+          (#{bind_params})
+          RETURNING id;
       SQL
-      return self
+      self.id = result.first['id']
+      self
     end
-  end
 
-  def insert
-    columns = self.class.columns.reject { |col| col == :id }
-    column_values = columns.map {|attr_name| send(attr_name)}
-    column_names = columns.join(", ")
-    bind_params = (1..columns.length).map {|n| "$#{n}"}.join(", ")
-    result = DBConnection.execute(<<-SQL, column_values)
-      INSERT INTO
-        #{self.class.table_name} (#{column_names})
-      VALUES
-        (#{bind_params})
-        RETURNING id;
-    SQL
-    self.id = result.first['id']
-    self
-  end
+    def save
+      self.class.find(id) ? update : insert
+    end
 
-  def save
-    self.class.find(id) ? update : insert
-  end
+    def update
+      set_line = self.class.columns.map do |column|
+        "#{column} = \'#{self.send(column)}\'"
+      end.join(", ")
 
-  def update
-    set_line = self.class.columns.map do |column|
-      #bobby tables says hi!
-      "#{column} = \'#{self.send(column)}\'"
-    end.join(", ")
-
-    DBConnection.execute(<<-SQL)
-      UPDATE
-        #{self.class.table_name}
-      SET
-        #{set_line}
-      WHERE
-        id = #{id}
-    SQL
-    self
+      Puffs::DBConnection.execute(<<-SQL)
+        UPDATE
+          #{self.class.table_name}
+        SET
+          #{set_line}
+        WHERE
+          id = #{id}
+      SQL
+      self
+    end
   end
 end

data/puffs.gemspec

@@ -4,35 +4,36 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  spec.name          = "puffs"
-  spec.version       = "0.2.04"
-  spec.authors       = ["Zachary Moroni"]
-  spec.email         = ["zachary.moroni@gmail.com"]
+  spec.name          = 'puffs'
+  spec.version       = '0.2.05'
+  spec.authors       = ['Zachary Moroni']
+  spec.email         = ['zachary.moroni@gmail.com']
 
-  spec.summary       = %q{A simple ORM and MVC inspired by Rails.}
-  spec.description   = %q{Make simple apps the Rails way, but with less overhead.}
-  spec.homepage      = "http://github.com/snackzone/puffs"
-  spec.license       = "MIT"
+  spec.summary       = %q(A simple ORM and MVC inspired by Rails.)
+  spec.description   =
+            %q(Make simple apps the Rails way, but with less overhead.)
+  spec.homepage      = 'http://github.com/snackzone/puffs'
+  spec.license       = 'MIT'
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "https://rubygems.org"
+    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
   else
-    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+    raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.'
   end
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.executables   = "puffs"
+  spec.executables   = 'puffs'
 
-  spec.add_runtime_dependency "thor", "~> 0.19"
-  spec.add_runtime_dependency "pg", "~> 0.18"
-  spec.add_runtime_dependency "activesupport", '~> 4.2', '>= 4.2.5.1'
-  spec.add_runtime_dependency "pry", "~> 0.10.3"
-  spec.add_runtime_dependency "rack", '~> 1.6', '>= 1.6.4'
-  spec.add_runtime_dependency "fileutils", "~> 0.7"
+  spec.add_runtime_dependency 'thor', '~> 0.19'
+  spec.add_runtime_dependency 'pg', '~> 0.18'
+  spec.add_runtime_dependency 'activesupport', '~> 4.2', '>= 4.2.5.1'
+  spec.add_runtime_dependency 'pry', '~> 0.10.3'
+  spec.add_runtime_dependency 'rack', '~> 1.6', '>= 1.6.4'
+  spec.add_runtime_dependency 'fileutils', '~> 0.7'
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/readme.md

@@ -134,3 +134,10 @@ Puffs Console
 
 Access your DB with `Puffs::SQLObject` methods by simply entering
 `require 'puffs'` in Pry (or IRB).
+
+Todos
+-----
+
+* [ ] Flash / Flash.now
+* [ ] CSRF Form Authenticity Token
+* [ ] Production Database (push to Heroku)

data/template/config/routes.rb

@@ -1,4 +1,4 @@
-ROUTER = Router.new
+ROUTER = Puffs::Router.new
 ROUTER.draw do
   #Some sample routes:
 

data/template/db/seeds.rb

@@ -1,24 +1,26 @@
-class Seed
-  def self.populate
-    #Create seeds in this method. Here's an example:
+module Puffs
+  class Seed
+    def self.populate
+      # Create seeds in this method. Here's an example:
 
-    # Cat.destroy_all!
-    # Human.destroy_all!
-    # House.destroy_all!
-    #
-    # h1 = House.new(address: '26th and Guerrero').save
-    # h2 = House.new(address: 'Dolores and Market').save
-    # h3 = House.new(address: '123 4th Street').save
-    #
-    # devon = Human.new(fname: 'Devon', lname: 'Watts', house_id: h1.id).save
-    # matt = Human.new(fname: 'Matt', lname: 'Rubens', house_id: h1.id).save
-    # ned = Human.new(fname: 'Ned', lname: 'Ruggeri', house_id: h2.id).save
-    # catless = Human.new(fname: 'Catless', lname: 'Human', house_id: h3.id).save
-    #
-    # Cat.new(name: 'Breakfast', owner_id: devon.id).save
-    # Cat.new(name:'Earl', owner_id: matt.id).save
-    # Cat.new(name: 'Haskell', owner_id: ned.id).save
-    # Cat.new(name: 'Markov', owner_id: ned.id).save
-    # Cat.new(name: 'Stray Cat')
+      # Cat.destroy_all!
+      # Human.destroy_all!
+      # House.destroy_all!
+      #
+      # h1 = House.new(address: '26th and Guerrero').save
+      # h2 = House.new(address: 'Dolores and Market').save
+      # h3 = House.new(address: '123 4th Street').save
+      #
+      # devon = Human.new(fname: 'Devon', lname: 'Watts', house_id: h1.id).save
+      # matt = Human.new(fname: 'Matt', lname: 'Rubens', house_id: h1.id).save
+      # ned = Human.new(fname: 'Ned', lname: 'Ruggeri', house_id: h2.id).save
+      # catless = Human.new(fname: 'Catless', lname: 'Human', house_id: h3.id).save
+      #
+      # Cat.new(name: 'Breakfast', owner_id: devon.id).save
+      # Cat.new(name:'Earl', owner_id: matt.id).save
+      # Cat.new(name: 'Haskell', owner_id: ned.id).save
+      # Cat.new(name: 'Markov', owner_id: ned.id).save
+      # Cat.new(name: 'Stray Cat')
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puffs
 version: !ruby/object:Gem::Version
-  version: 0.2.04
+  version: 0.2.05
 platform: ruby
 authors:
 - Zachary Moroni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor